diff --git a/composer.json b/composer.json
index 50fa493a4..6612b101b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "~3.1.0",
     "scssphp/scssphp": "~1.10.2",
-    "swiftmailer/swiftmailer": "5.4.12",
+    "swiftmailer/swiftmailer": "~6.3.0",
     "symfony/console": "~3.4.47",
     "symfony/dotenv": "~3.4.47",
     "symfony/framework-bundle": "~3.4.47",
diff --git a/composer.lock b/composer.lock
index 28df02e52..7e7def5f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8187e0bd608a597a5151a468aa1f4c7a",
+    "content-hash": "781e902cab2de8cfdfefbb4a62cc1b01",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -84,6 +84,138 @@
             ],
             "time": "2022-03-10T14:36:39+00:00"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.0.2"
+            },
+            "time": "2019-06-08T11:03:04+00:00"
+        },
+        {
+            "name": "egulias/email-validator",
+            "version": "2.1.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^1.0.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.10"
+            },
+            "require-dev": {
+                "dominicsayers/isemail": "^3.0.7",
+                "phpunit/phpunit": "^4.8.36|^7.5.15",
+                "satooshi/php-coveralls": "^1.0.1"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-12-29T14:50:06+00:00"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.13.2",
@@ -759,29 +891,36 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.12",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950"
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "egulias/email-validator": "^2.0|^3.1",
+                "php": ">=7.0.0",
+                "symfony/polyfill-iconv": "^1.0",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1",
-                "symfony/phpunit-bridge": "~3.2"
+                "mockery/mockery": "^1.0",
+                "symfony/phpunit-bridge": "^4.4|^5.4"
+            },
+            "suggest": {
+                "ext-intl": "Needed to support internationalized email addresses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.4-dev"
+                    "dev-master": "6.2-dev"
                 }
             },
             "autoload": {
@@ -809,7 +948,22 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2018-07-31T09:26:32+00:00"
+            "support": {
+                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
+                    "type": "tidelift"
+                }
+            ],
+            "abandoned": "symfony/mailer",
+            "time": "2021-10-18T15:26:12+00:00"
         },
         {
             "name": "symfony/cache",
@@ -2056,6 +2210,258 @@
             ],
             "time": "2020-10-23T09:01:57+00:00"
         },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/085241787d52fa6f7a774fd034135fef0cfd5496",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-21T09:57:48+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.19.0",
@@ -2293,6 +2699,82 @@
             ],
             "time": "2020-10-23T09:01:57+00:00"
         },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
         {
             "name": "symfony/polyfill-util",
             "version": "v1.19.0",
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 6949d28f6..b2e6f9507 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -234,7 +234,73 @@ return array(
     'DisplayableNode' => $baseDir . '/core/displayablegraph.class.inc.php',
     'DisplayableRedundancyNode' => $baseDir . '/core/displayablegraph.class.inc.php',
     'DivisionByZeroError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
+    'Doctrine\\Common\\Lexer\\AbstractLexer' => $vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
     'EMail' => $baseDir . '/core/email.class.inc.php',
+    'Egulias\\EmailValidator\\EmailLexer' => $vendorDir . '/egulias/email-validator/src/EmailLexer.php',
+    'Egulias\\EmailValidator\\EmailParser' => $vendorDir . '/egulias/email-validator/src/EmailParser.php',
+    'Egulias\\EmailValidator\\EmailValidator' => $vendorDir . '/egulias/email-validator/src/EmailValidator.php',
+    'Egulias\\EmailValidator\\Exception\\AtextAfterCFWS' => $vendorDir . '/egulias/email-validator/src/Exception/AtextAfterCFWS.php',
+    'Egulias\\EmailValidator\\Exception\\CRLFAtTheEnd' => $vendorDir . '/egulias/email-validator/src/Exception/CRLFAtTheEnd.php',
+    'Egulias\\EmailValidator\\Exception\\CRLFX2' => $vendorDir . '/egulias/email-validator/src/Exception/CRLFX2.php',
+    'Egulias\\EmailValidator\\Exception\\CRNoLF' => $vendorDir . '/egulias/email-validator/src/Exception/CRNoLF.php',
+    'Egulias\\EmailValidator\\Exception\\CharNotAllowed' => $vendorDir . '/egulias/email-validator/src/Exception/CharNotAllowed.php',
+    'Egulias\\EmailValidator\\Exception\\CommaInDomain' => $vendorDir . '/egulias/email-validator/src/Exception/CommaInDomain.php',
+    'Egulias\\EmailValidator\\Exception\\ConsecutiveAt' => $vendorDir . '/egulias/email-validator/src/Exception/ConsecutiveAt.php',
+    'Egulias\\EmailValidator\\Exception\\ConsecutiveDot' => $vendorDir . '/egulias/email-validator/src/Exception/ConsecutiveDot.php',
+    'Egulias\\EmailValidator\\Exception\\DomainAcceptsNoMail' => $vendorDir . '/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php',
+    'Egulias\\EmailValidator\\Exception\\DomainHyphened' => $vendorDir . '/egulias/email-validator/src/Exception/DomainHyphened.php',
+    'Egulias\\EmailValidator\\Exception\\DotAtEnd' => $vendorDir . '/egulias/email-validator/src/Exception/DotAtEnd.php',
+    'Egulias\\EmailValidator\\Exception\\DotAtStart' => $vendorDir . '/egulias/email-validator/src/Exception/DotAtStart.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingAT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingAT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingATEXT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingATEXT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingCTEXT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingCTEXT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingDTEXT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingDTEXT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingDomainLiteralClose' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingQPair' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingQPair.php',
+    'Egulias\\EmailValidator\\Exception\\InvalidEmail' => $vendorDir . '/egulias/email-validator/src/Exception/InvalidEmail.php',
+    'Egulias\\EmailValidator\\Exception\\LocalOrReservedDomain' => $vendorDir . '/egulias/email-validator/src/Exception/LocalOrReservedDomain.php',
+    'Egulias\\EmailValidator\\Exception\\NoDNSRecord' => $vendorDir . '/egulias/email-validator/src/Exception/NoDNSRecord.php',
+    'Egulias\\EmailValidator\\Exception\\NoDomainPart' => $vendorDir . '/egulias/email-validator/src/Exception/NoDomainPart.php',
+    'Egulias\\EmailValidator\\Exception\\NoLocalPart' => $vendorDir . '/egulias/email-validator/src/Exception/NoLocalPart.php',
+    'Egulias\\EmailValidator\\Exception\\UnclosedComment' => $vendorDir . '/egulias/email-validator/src/Exception/UnclosedComment.php',
+    'Egulias\\EmailValidator\\Exception\\UnclosedQuotedString' => $vendorDir . '/egulias/email-validator/src/Exception/UnclosedQuotedString.php',
+    'Egulias\\EmailValidator\\Exception\\UnopenedComment' => $vendorDir . '/egulias/email-validator/src/Exception/UnopenedComment.php',
+    'Egulias\\EmailValidator\\Parser\\DomainPart' => $vendorDir . '/egulias/email-validator/src/Parser/DomainPart.php',
+    'Egulias\\EmailValidator\\Parser\\LocalPart' => $vendorDir . '/egulias/email-validator/src/Parser/LocalPart.php',
+    'Egulias\\EmailValidator\\Parser\\Parser' => $vendorDir . '/egulias/email-validator/src/Parser/Parser.php',
+    'Egulias\\EmailValidator\\Validation\\DNSCheckValidation' => $vendorDir . '/egulias/email-validator/src/Validation/DNSCheckValidation.php',
+    'Egulias\\EmailValidator\\Validation\\EmailValidation' => $vendorDir . '/egulias/email-validator/src/Validation/EmailValidation.php',
+    'Egulias\\EmailValidator\\Validation\\Error\\RFCWarnings' => $vendorDir . '/egulias/email-validator/src/Validation/Error/RFCWarnings.php',
+    'Egulias\\EmailValidator\\Validation\\Error\\SpoofEmail' => $vendorDir . '/egulias/email-validator/src/Validation/Error/SpoofEmail.php',
+    'Egulias\\EmailValidator\\Validation\\Exception\\EmptyValidationList' => $vendorDir . '/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php',
+    'Egulias\\EmailValidator\\Validation\\MultipleErrors' => $vendorDir . '/egulias/email-validator/src/Validation/MultipleErrors.php',
+    'Egulias\\EmailValidator\\Validation\\MultipleValidationWithAnd' => $vendorDir . '/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php',
+    'Egulias\\EmailValidator\\Validation\\NoRFCWarningsValidation' => $vendorDir . '/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php',
+    'Egulias\\EmailValidator\\Validation\\RFCValidation' => $vendorDir . '/egulias/email-validator/src/Validation/RFCValidation.php',
+    'Egulias\\EmailValidator\\Validation\\SpoofCheckValidation' => $vendorDir . '/egulias/email-validator/src/Validation/SpoofCheckValidation.php',
+    'Egulias\\EmailValidator\\Warning\\AddressLiteral' => $vendorDir . '/egulias/email-validator/src/Warning/AddressLiteral.php',
+    'Egulias\\EmailValidator\\Warning\\CFWSNearAt' => $vendorDir . '/egulias/email-validator/src/Warning/CFWSNearAt.php',
+    'Egulias\\EmailValidator\\Warning\\CFWSWithFWS' => $vendorDir . '/egulias/email-validator/src/Warning/CFWSWithFWS.php',
+    'Egulias\\EmailValidator\\Warning\\Comment' => $vendorDir . '/egulias/email-validator/src/Warning/Comment.php',
+    'Egulias\\EmailValidator\\Warning\\DeprecatedComment' => $vendorDir . '/egulias/email-validator/src/Warning/DeprecatedComment.php',
+    'Egulias\\EmailValidator\\Warning\\DomainLiteral' => $vendorDir . '/egulias/email-validator/src/Warning/DomainLiteral.php',
+    'Egulias\\EmailValidator\\Warning\\DomainTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/DomainTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\EmailTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/EmailTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6BadChar' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6BadChar.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6ColonEnd' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6ColonEnd.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6ColonStart' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6ColonStart.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6Deprecated' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6Deprecated.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6DoubleColon' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6DoubleColon.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6GroupCount' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6GroupCount.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6MaxGroups' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6MaxGroups.php',
+    'Egulias\\EmailValidator\\Warning\\LabelTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/LabelTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\LocalTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/LocalTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\NoDNSMXRecord' => $vendorDir . '/egulias/email-validator/src/Warning/NoDNSMXRecord.php',
+    'Egulias\\EmailValidator\\Warning\\ObsoleteDTEXT' => $vendorDir . '/egulias/email-validator/src/Warning/ObsoleteDTEXT.php',
+    'Egulias\\EmailValidator\\Warning\\QuotedPart' => $vendorDir . '/egulias/email-validator/src/Warning/QuotedPart.php',
+    'Egulias\\EmailValidator\\Warning\\QuotedString' => $vendorDir . '/egulias/email-validator/src/Warning/QuotedString.php',
+    'Egulias\\EmailValidator\\Warning\\TLD' => $vendorDir . '/egulias/email-validator/src/Warning/TLD.php',
+    'Egulias\\EmailValidator\\Warning\\Warning' => $vendorDir . '/egulias/email-validator/src/Warning/Warning.php',
     'Error' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/Error.php',
     'ErrorPage' => $baseDir . '/application/errorpage.class.inc.php',
     'Event' => $baseDir . '/core/event.class.inc.php',
@@ -321,6 +387,7 @@ return array(
     'NewObjectMenuNode' => $baseDir . '/application/menunode.class.inc.php',
     'NewsroomProviderBase' => $baseDir . '/application/newsroomprovider.class.inc.php',
     'NiceWebPage' => $baseDir . '/application/nicewebpage.class.inc.php',
+    'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
     'OQLActualClassTreeResolver' => $baseDir . '/core/oqlactualclasstreeresolver.class.inc.php',
     'OQLClassNode' => $baseDir . '/core/oqlclassnode.class.inc.php',
     'OQLClassTreeBuilder' => $baseDir . '/core/oqlclasstreebuilder.class.inc.php',
@@ -1744,9 +1811,16 @@ return array(
     'Symfony\\Component\\Yaml\\Yaml' => $vendorDir . '/symfony/yaml/Yaml.php',
     'Symfony\\Polyfill\\Apcu\\Apcu' => $vendorDir . '/symfony/polyfill-apcu/Apcu.php',
     'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
+    'Symfony\\Polyfill\\Iconv\\Iconv' => $vendorDir . '/symfony/polyfill-iconv/Iconv.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Idn' => $vendorDir . '/symfony/polyfill-intl-idn/Idn.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Info' => $vendorDir . '/symfony/polyfill-intl-idn/Info.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\DisallowedRanges' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php',
+    'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php',
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
     'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
     'Symfony\\Polyfill\\Php70\\Php70' => $vendorDir . '/symfony/polyfill-php70/Php70.php',
+    'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
     'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
     'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
     'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
diff --git a/lib/composer/autoload_files.php b/lib/composer/autoload_files.php
index 6706671aa..4e28b93b7 100644
--- a/lib/composer/autoload_files.php
+++ b/lib/composer/autoload_files.php
@@ -7,11 +7,15 @@ $baseDir = dirname($vendorDir);
 
 return array(
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
     'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
+    'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
     '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
+    'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );
diff --git a/lib/composer/autoload_psr4.php b/lib/composer/autoload_psr4.php
index 596febb62..7d6039aea 100644
--- a/lib/composer/autoload_psr4.php
+++ b/lib/composer/autoload_psr4.php
@@ -8,9 +8,13 @@ $baseDir = dirname($vendorDir);
 return array(
     'Twig\\' => array($vendorDir . '/twig/twig/src'),
     'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
+    'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
     'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'),
     'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
+    'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
+    'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'),
+    'Symfony\\Polyfill\\Iconv\\' => array($vendorDir . '/symfony/polyfill-iconv'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'Symfony\\Polyfill\\Apcu\\' => array($vendorDir . '/symfony/polyfill-apcu'),
     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
@@ -41,4 +45,6 @@ return array(
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'Pelago\\' => array($vendorDir . '/pelago/emogrifier/src'),
+    'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
+    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer'),
 );
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 0cdbd54c9..0e1856fcf 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -8,11 +8,15 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
+        'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
         '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
+        'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
     );
@@ -25,9 +29,13 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'S' => 
         array (
             'Symfony\\Polyfill\\Util\\' => 22,
+            'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Php70\\' => 23,
             'Symfony\\Polyfill\\Php56\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
+            'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33,
+            'Symfony\\Polyfill\\Intl\\Idn\\' => 26,
+            'Symfony\\Polyfill\\Iconv\\' => 23,
             'Symfony\\Polyfill\\Ctype\\' => 23,
             'Symfony\\Polyfill\\Apcu\\' => 22,
             'Symfony\\Component\\Yaml\\' => 23,
@@ -62,6 +70,14 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
             'PhpParser\\' => 10,
             'Pelago\\' => 7,
         ),
+        'E' => 
+        array (
+            'Egulias\\EmailValidator\\' => 23,
+        ),
+        'D' => 
+        array (
+            'Doctrine\\Common\\Lexer\\' => 22,
+        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -73,6 +89,10 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-util',
         ),
+        'Symfony\\Polyfill\\Php72\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php72',
+        ),
         'Symfony\\Polyfill\\Php70\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-php70',
@@ -85,6 +105,18 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
         ),
+        'Symfony\\Polyfill\\Intl\\Normalizer\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer',
+        ),
+        'Symfony\\Polyfill\\Intl\\Idn\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-intl-idn',
+        ),
+        'Symfony\\Polyfill\\Iconv\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-iconv',
+        ),
         'Symfony\\Polyfill\\Ctype\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
@@ -205,6 +237,14 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         array (
             0 => __DIR__ . '/..' . '/pelago/emogrifier/src',
         ),
+        'Egulias\\EmailValidator\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/egulias/email-validator/src',
+        ),
+        'Doctrine\\Common\\Lexer\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer',
+        ),
     );
 
     public static $prefixesPsr0 = array (
@@ -464,7 +504,73 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'DisplayableNode' => __DIR__ . '/../..' . '/core/displayablegraph.class.inc.php',
         'DisplayableRedundancyNode' => __DIR__ . '/../..' . '/core/displayablegraph.class.inc.php',
         'DivisionByZeroError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
+        'Doctrine\\Common\\Lexer\\AbstractLexer' => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
         'EMail' => __DIR__ . '/../..' . '/core/email.class.inc.php',
+        'Egulias\\EmailValidator\\EmailLexer' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailLexer.php',
+        'Egulias\\EmailValidator\\EmailParser' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailParser.php',
+        'Egulias\\EmailValidator\\EmailValidator' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailValidator.php',
+        'Egulias\\EmailValidator\\Exception\\AtextAfterCFWS' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/AtextAfterCFWS.php',
+        'Egulias\\EmailValidator\\Exception\\CRLFAtTheEnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CRLFAtTheEnd.php',
+        'Egulias\\EmailValidator\\Exception\\CRLFX2' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CRLFX2.php',
+        'Egulias\\EmailValidator\\Exception\\CRNoLF' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CRNoLF.php',
+        'Egulias\\EmailValidator\\Exception\\CharNotAllowed' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CharNotAllowed.php',
+        'Egulias\\EmailValidator\\Exception\\CommaInDomain' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CommaInDomain.php',
+        'Egulias\\EmailValidator\\Exception\\ConsecutiveAt' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ConsecutiveAt.php',
+        'Egulias\\EmailValidator\\Exception\\ConsecutiveDot' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ConsecutiveDot.php',
+        'Egulias\\EmailValidator\\Exception\\DomainAcceptsNoMail' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php',
+        'Egulias\\EmailValidator\\Exception\\DomainHyphened' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DomainHyphened.php',
+        'Egulias\\EmailValidator\\Exception\\DotAtEnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DotAtEnd.php',
+        'Egulias\\EmailValidator\\Exception\\DotAtStart' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DotAtStart.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingAT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingAT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingATEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingATEXT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingCTEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingCTEXT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingDTEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingDTEXT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingDomainLiteralClose' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingQPair' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingQPair.php',
+        'Egulias\\EmailValidator\\Exception\\InvalidEmail' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/InvalidEmail.php',
+        'Egulias\\EmailValidator\\Exception\\LocalOrReservedDomain' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/LocalOrReservedDomain.php',
+        'Egulias\\EmailValidator\\Exception\\NoDNSRecord' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/NoDNSRecord.php',
+        'Egulias\\EmailValidator\\Exception\\NoDomainPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/NoDomainPart.php',
+        'Egulias\\EmailValidator\\Exception\\NoLocalPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/NoLocalPart.php',
+        'Egulias\\EmailValidator\\Exception\\UnclosedComment' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/UnclosedComment.php',
+        'Egulias\\EmailValidator\\Exception\\UnclosedQuotedString' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/UnclosedQuotedString.php',
+        'Egulias\\EmailValidator\\Exception\\UnopenedComment' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/UnopenedComment.php',
+        'Egulias\\EmailValidator\\Parser\\DomainPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Parser/DomainPart.php',
+        'Egulias\\EmailValidator\\Parser\\LocalPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Parser/LocalPart.php',
+        'Egulias\\EmailValidator\\Parser\\Parser' => __DIR__ . '/..' . '/egulias/email-validator/src/Parser/Parser.php',
+        'Egulias\\EmailValidator\\Validation\\DNSCheckValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/DNSCheckValidation.php',
+        'Egulias\\EmailValidator\\Validation\\EmailValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/EmailValidation.php',
+        'Egulias\\EmailValidator\\Validation\\Error\\RFCWarnings' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/Error/RFCWarnings.php',
+        'Egulias\\EmailValidator\\Validation\\Error\\SpoofEmail' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/Error/SpoofEmail.php',
+        'Egulias\\EmailValidator\\Validation\\Exception\\EmptyValidationList' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php',
+        'Egulias\\EmailValidator\\Validation\\MultipleErrors' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/MultipleErrors.php',
+        'Egulias\\EmailValidator\\Validation\\MultipleValidationWithAnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php',
+        'Egulias\\EmailValidator\\Validation\\NoRFCWarningsValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php',
+        'Egulias\\EmailValidator\\Validation\\RFCValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/RFCValidation.php',
+        'Egulias\\EmailValidator\\Validation\\SpoofCheckValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/SpoofCheckValidation.php',
+        'Egulias\\EmailValidator\\Warning\\AddressLiteral' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/AddressLiteral.php',
+        'Egulias\\EmailValidator\\Warning\\CFWSNearAt' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/CFWSNearAt.php',
+        'Egulias\\EmailValidator\\Warning\\CFWSWithFWS' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/CFWSWithFWS.php',
+        'Egulias\\EmailValidator\\Warning\\Comment' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/Comment.php',
+        'Egulias\\EmailValidator\\Warning\\DeprecatedComment' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/DeprecatedComment.php',
+        'Egulias\\EmailValidator\\Warning\\DomainLiteral' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/DomainLiteral.php',
+        'Egulias\\EmailValidator\\Warning\\DomainTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/DomainTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\EmailTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/EmailTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6BadChar' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6BadChar.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6ColonEnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6ColonEnd.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6ColonStart' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6ColonStart.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6Deprecated' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6Deprecated.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6DoubleColon' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6DoubleColon.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6GroupCount' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6GroupCount.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6MaxGroups' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6MaxGroups.php',
+        'Egulias\\EmailValidator\\Warning\\LabelTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/LabelTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\LocalTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/LocalTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\NoDNSMXRecord' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/NoDNSMXRecord.php',
+        'Egulias\\EmailValidator\\Warning\\ObsoleteDTEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/ObsoleteDTEXT.php',
+        'Egulias\\EmailValidator\\Warning\\QuotedPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/QuotedPart.php',
+        'Egulias\\EmailValidator\\Warning\\QuotedString' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/QuotedString.php',
+        'Egulias\\EmailValidator\\Warning\\TLD' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/TLD.php',
+        'Egulias\\EmailValidator\\Warning\\Warning' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/Warning.php',
         'Error' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/Error.php',
         'ErrorPage' => __DIR__ . '/../..' . '/application/errorpage.class.inc.php',
         'Event' => __DIR__ . '/../..' . '/core/event.class.inc.php',
@@ -551,6 +657,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'NewObjectMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
         'NewsroomProviderBase' => __DIR__ . '/../..' . '/application/newsroomprovider.class.inc.php',
         'NiceWebPage' => __DIR__ . '/../..' . '/application/nicewebpage.class.inc.php',
+        'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
         'OQLActualClassTreeResolver' => __DIR__ . '/../..' . '/core/oqlactualclasstreeresolver.class.inc.php',
         'OQLClassNode' => __DIR__ . '/../..' . '/core/oqlclassnode.class.inc.php',
         'OQLClassTreeBuilder' => __DIR__ . '/../..' . '/core/oqlclasstreebuilder.class.inc.php',
@@ -1974,9 +2081,16 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Symfony\\Component\\Yaml\\Yaml' => __DIR__ . '/..' . '/symfony/yaml/Yaml.php',
         'Symfony\\Polyfill\\Apcu\\Apcu' => __DIR__ . '/..' . '/symfony/polyfill-apcu/Apcu.php',
         'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
+        'Symfony\\Polyfill\\Iconv\\Iconv' => __DIR__ . '/..' . '/symfony/polyfill-iconv/Iconv.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Idn' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Idn.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Info' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Info.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\DisallowedRanges' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php',
+        'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php',
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
         'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
         'Symfony\\Polyfill\\Php70\\Php70' => __DIR__ . '/..' . '/symfony/polyfill-php70/Php70.php',
+        'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
         'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php',
         'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
         'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 46bd25c1f..12bcf5f89 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -81,6 +81,144 @@
             ],
             "install-path": "../combodo/tcpdf"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
+            "time": "2019-06-08T11:03:04+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.0.2"
+            },
+            "install-path": "../doctrine/lexer"
+        },
+        {
+            "name": "egulias/email-validator",
+            "version": "2.1.25",
+            "version_normalized": "2.1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^1.0.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.10"
+            },
+            "require-dev": {
+                "dominicsayers/isemail": "^3.0.7",
+                "phpunit/phpunit": "^4.8.36|^7.5.15",
+                "satooshi/php-coveralls": "^1.0.1"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            },
+            "time": "2020-12-29T14:50:06+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "install-path": "../egulias/email-validator"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.13.2",
@@ -792,31 +930,38 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.12",
-            "version_normalized": "5.4.12.0",
+            "version": "v6.3.0",
+            "version_normalized": "6.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950"
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "egulias/email-validator": "^2.0|^3.1",
+                "php": ">=7.0.0",
+                "symfony/polyfill-iconv": "^1.0",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1",
-                "symfony/phpunit-bridge": "~3.2"
+                "mockery/mockery": "^1.0",
+                "symfony/phpunit-bridge": "^4.4|^5.4"
             },
-            "time": "2018-07-31T09:26:32+00:00",
+            "suggest": {
+                "ext-intl": "Needed to support internationalized email addresses"
+            },
+            "time": "2021-10-18T15:26:12+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.4-dev"
+                    "dev-master": "6.2-dev"
                 }
             },
             "installation-source": "dist",
@@ -845,6 +990,21 @@
                 "mail",
                 "mailer"
             ],
+            "support": {
+                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
+                    "type": "tidelift"
+                }
+            ],
+            "abandoned": "symfony/mailer",
             "install-path": "../swiftmailer/swiftmailer"
         },
         {
@@ -2140,6 +2300,267 @@
             ],
             "install-path": "../symfony/polyfill-ctype"
         },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/085241787d52fa6f7a774fd034135fef0cfd5496",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "time": "2020-10-23T09:01:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-iconv"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "time": "2020-10-21T09:57:48+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-intl-idn"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "time": "2020-10-23T09:01:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-intl-normalizer"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.19.0",
@@ -2386,6 +2807,85 @@
             ],
             "install-path": "../symfony/polyfill-php70"
         },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2020-10-23T09:01:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-php72"
+        },
         {
             "name": "symfony/polyfill-util",
             "version": "v1.19.0",
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index f46000ad9..9eda3ec76 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'a5ce09c4396a111c9c22aeb83fd5eefd1a55fb8f',
+        'reference' => '8c60e05b1a1d7e135bcf0cbf0d1bf337a623ff15',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'a5ce09c4396a111c9c22aeb83fd5eefd1a55fb8f',
+            'reference' => '8c60e05b1a1d7e135bcf0cbf0d1bf337a623ff15',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -28,6 +28,24 @@
             'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'dev_requirement' => false,
         ),
+        'doctrine/lexer' => array(
+            'pretty_version' => '1.0.2',
+            'version' => '1.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../doctrine/lexer',
+            'aliases' => array(),
+            'reference' => '1febd6c3ef84253d7c815bed85fc622ad207a9f8',
+            'dev_requirement' => false,
+        ),
+        'egulias/email-validator' => array(
+            'pretty_version' => '2.1.25',
+            'version' => '2.1.25.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../egulias/email-validator',
+            'aliases' => array(),
+            'reference' => '0dbf5d78455d4d6a41d186da50adc1122ec066f4',
+            'dev_requirement' => false,
+        ),
         'nikic/php-parser' => array(
             'pretty_version' => 'v4.13.2',
             'version' => '4.13.2.0',
@@ -167,12 +185,12 @@
             'dev_requirement' => false,
         ),
         'swiftmailer/swiftmailer' => array(
-            'pretty_version' => 'v5.4.12',
-            'version' => '5.4.12.0',
+            'pretty_version' => 'v6.3.0',
+            'version' => '6.3.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../swiftmailer/swiftmailer',
             'aliases' => array(),
-            'reference' => '181b89f18a90f8925ef805f950d47a7190e9b950',
+            'reference' => '8a5d5072dca8f48460fce2f4131fcc495eec654c',
             'dev_requirement' => false,
         ),
         'symfony/cache' => array(
@@ -319,6 +337,33 @@
             'reference' => 'aed596913b70fae57be53d86faa2e9ef85a2297b',
             'dev_requirement' => false,
         ),
+        'symfony/polyfill-iconv' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-iconv',
+            'aliases' => array(),
+            'reference' => '085241787d52fa6f7a774fd034135fef0cfd5496',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-intl-idn' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
+            'aliases' => array(),
+            'reference' => '4ad5115c0f5d5172a9fe8147675ec6de266d8826',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-intl-normalizer' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
+            'aliases' => array(),
+            'reference' => '8db0ae7936b42feb370840cf24de1a144fb0ef27',
+            'dev_requirement' => false,
+        ),
         'symfony/polyfill-mbstring' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
@@ -346,6 +391,15 @@
             'reference' => '3fe414077251a81a1b15b1c709faf5c2fbae3d4e',
             'dev_requirement' => false,
         ),
+        'symfony/polyfill-php72' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-php72',
+            'aliases' => array(),
+            'reference' => 'beecef6b463b06954638f02378f52496cb84bacc',
+            'dev_requirement' => false,
+        ),
         'symfony/polyfill-util' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
diff --git a/lib/doctrine/lexer/.doctrine-project.json b/lib/doctrine/lexer/.doctrine-project.json
new file mode 100644
index 000000000..01ccb7780
--- /dev/null
+++ b/lib/doctrine/lexer/.doctrine-project.json
@@ -0,0 +1,17 @@
+{
+    "active": true,
+    "name": "Lexer",
+    "slug": "lexer",
+    "docsSlug": "doctrine-lexer",
+    "versions": [
+        {
+            "name": "master",
+            "branchName": "master",
+            "slug": "latest",
+            "aliases": [
+                "current",
+                "stable"
+            ]
+        }
+    ]
+}
diff --git a/lib/doctrine/lexer/.github/FUNDING.yml b/lib/doctrine/lexer/.github/FUNDING.yml
new file mode 100644
index 000000000..e081a97a2
--- /dev/null
+++ b/lib/doctrine/lexer/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+patreon: phpdoctrine
+tidelift: packagist/doctrine%2Flexer
+custom: https://www.doctrine-project.org/sponsorship.html
diff --git a/lib/doctrine/lexer/.gitignore b/lib/doctrine/lexer/.gitignore
new file mode 100644
index 000000000..7579f7431
--- /dev/null
+++ b/lib/doctrine/lexer/.gitignore
@@ -0,0 +1,2 @@
+vendor
+composer.lock
diff --git a/lib/doctrine/lexer/LICENSE b/lib/doctrine/lexer/LICENSE
new file mode 100644
index 000000000..e8fdec4af
--- /dev/null
+++ b/lib/doctrine/lexer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2006-2018 Doctrine Project
+
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/doctrine/lexer/README.md b/lib/doctrine/lexer/README.md
new file mode 100644
index 000000000..3a74c1c31
--- /dev/null
+++ b/lib/doctrine/lexer/README.md
@@ -0,0 +1,7 @@
+# Doctrine Lexer
+
+Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.
+
+This lexer is used in Doctrine Annotations and in Doctrine ORM (DQL).
+
+https://www.doctrine-project.org/projects/lexer.html
diff --git a/lib/doctrine/lexer/composer.json b/lib/doctrine/lexer/composer.json
new file mode 100644
index 000000000..6ea83543a
--- /dev/null
+++ b/lib/doctrine/lexer/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "doctrine/lexer",
+    "type": "library",
+    "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+    "keywords": [
+        "php",
+        "parser",
+        "lexer",
+        "annotations",
+        "docblock"
+    ],
+    "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+    "license": "MIT",
+    "authors": [
+        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
+        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
+        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
+    ],
+    "require": {
+        "php": ">=5.3.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.5"
+    },
+    "autoload": {
+        "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/lib/doctrine/lexer/docs/en/dql-parser.rst b/lib/doctrine/lexer/docs/en/dql-parser.rst
new file mode 100644
index 000000000..c7d581da2
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/dql-parser.rst
@@ -0,0 +1,294 @@
+DQL Lexer
+=========
+
+Here is a more complicated example from the Doctrine ORM project.
+The ``Doctrine\ORM\Query\Lexer`` implementation for DQL looks something
+like the following:
+
+.. code-block:: php
+
+    use Doctrine\Common\Lexer\AbstractLexer;
+
+    class Lexer extends AbstractLexer
+    {
+        // All tokens that are not valid identifiers must be < 100
+        public const T_NONE              = 1;
+        public const T_INTEGER           = 2;
+        public const T_STRING            = 3;
+        public const T_INPUT_PARAMETER   = 4;
+        public const T_FLOAT             = 5;
+        public const T_CLOSE_PARENTHESIS = 6;
+        public const T_OPEN_PARENTHESIS  = 7;
+        public const T_COMMA             = 8;
+        public const T_DIVIDE            = 9;
+        public const T_DOT               = 10;
+        public const T_EQUALS            = 11;
+        public const T_GREATER_THAN      = 12;
+        public const T_LOWER_THAN        = 13;
+        public const T_MINUS             = 14;
+        public const T_MULTIPLY          = 15;
+        public const T_NEGATE            = 16;
+        public const T_PLUS              = 17;
+        public const T_OPEN_CURLY_BRACE  = 18;
+        public const T_CLOSE_CURLY_BRACE = 19;
+
+        // All tokens that are identifiers or keywords that could be considered as identifiers should be >= 100
+        public const T_ALIASED_NAME         = 100;
+        public const T_FULLY_QUALIFIED_NAME = 101;
+        public const T_IDENTIFIER           = 102;
+
+        // All keyword tokens should be >= 200
+        public const T_ALL      = 200;
+        public const T_AND      = 201;
+        public const T_ANY      = 202;
+        public const T_AS       = 203;
+        public const T_ASC      = 204;
+        public const T_AVG      = 205;
+        public const T_BETWEEN  = 206;
+        public const T_BOTH     = 207;
+        public const T_BY       = 208;
+        public const T_CASE     = 209;
+        public const T_COALESCE = 210;
+        public const T_COUNT    = 211;
+        public const T_DELETE   = 212;
+        public const T_DESC     = 213;
+        public const T_DISTINCT = 214;
+        public const T_ELSE     = 215;
+        public const T_EMPTY    = 216;
+        public const T_END      = 217;
+        public const T_ESCAPE   = 218;
+        public const T_EXISTS   = 219;
+        public const T_FALSE    = 220;
+        public const T_FROM     = 221;
+        public const T_GROUP    = 222;
+        public const T_HAVING   = 223;
+        public const T_HIDDEN   = 224;
+        public const T_IN       = 225;
+        public const T_INDEX    = 226;
+        public const T_INNER    = 227;
+        public const T_INSTANCE = 228;
+        public const T_IS       = 229;
+        public const T_JOIN     = 230;
+        public const T_LEADING  = 231;
+        public const T_LEFT     = 232;
+        public const T_LIKE     = 233;
+        public const T_MAX      = 234;
+        public const T_MEMBER   = 235;
+        public const T_MIN      = 236;
+        public const T_NEW      = 237;
+        public const T_NOT      = 238;
+        public const T_NULL     = 239;
+        public const T_NULLIF   = 240;
+        public const T_OF       = 241;
+        public const T_OR       = 242;
+        public const T_ORDER    = 243;
+        public const T_OUTER    = 244;
+        public const T_PARTIAL  = 245;
+        public const T_SELECT   = 246;
+        public const T_SET      = 247;
+        public const T_SOME     = 248;
+        public const T_SUM      = 249;
+        public const T_THEN     = 250;
+        public const T_TRAILING = 251;
+        public const T_TRUE     = 252;
+        public const T_UPDATE   = 253;
+        public const T_WHEN     = 254;
+        public const T_WHERE    = 255;
+        public const T_WITH     = 256;
+
+        /**
+         * Creates a new query scanner object.
+         *
+         * @param string $input A query string.
+         */
+        public function __construct($input)
+        {
+            $this->setInput($input);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getCatchablePatterns()
+        {
+            return [
+                '[a-z_][a-z0-9_]*\:[a-z_][a-z0-9_]*(?:\\\[a-z_][a-z0-9_]*)*', // aliased name
+                '[a-z_\\\][a-z0-9_]*(?:\\\[a-z_][a-z0-9_]*)*', // identifier or qualified name
+                '(?:[0-9]+(?:[\.][0-9]+)*)(?:e[+-]?[0-9]+)?', // numbers
+                "'(?:[^']|'')*'", // quoted strings
+                '\?[0-9]*|:[a-z_][a-z0-9_]*', // parameters
+            ];
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getNonCatchablePatterns()
+        {
+            return ['\s+', '(.)'];
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getType(&$value)
+        {
+            $type = self::T_NONE;
+
+            switch (true) {
+                // Recognize numeric values
+                case (is_numeric($value)):
+                    if (strpos($value, '.') !== false || stripos($value, 'e') !== false) {
+                        return self::T_FLOAT;
+                    }
+
+                    return self::T_INTEGER;
+
+                // Recognize quoted strings
+                case ($value[0] === "'"):
+                    $value = str_replace("''", "'", substr($value, 1, strlen($value) - 2));
+
+                    return self::T_STRING;
+
+                // Recognize identifiers, aliased or qualified names
+                case (ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\'):
+                    $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+
+                    if (defined($name)) {
+                        $type = constant($name);
+
+                        if ($type > 100) {
+                            return $type;
+                        }
+                    }
+
+                    if (strpos($value, ':') !== false) {
+                        return self::T_ALIASED_NAME;
+                    }
+
+                    if (strpos($value, '\\') !== false) {
+                        return self::T_FULLY_QUALIFIED_NAME;
+                    }
+
+                    return self::T_IDENTIFIER;
+
+                // Recognize input parameters
+                case ($value[0] === '?' || $value[0] === ':'):
+                    return self::T_INPUT_PARAMETER;
+
+                // Recognize symbols
+                case ($value === '.'):
+                    return self::T_DOT;
+                case ($value === ','):
+                    return self::T_COMMA;
+                case ($value === '('):
+                    return self::T_OPEN_PARENTHESIS;
+                case ($value === ')'):
+                    return self::T_CLOSE_PARENTHESIS;
+                case ($value === '='):
+                    return self::T_EQUALS;
+                case ($value === '>'):
+                    return self::T_GREATER_THAN;
+                case ($value === '<'):
+                    return self::T_LOWER_THAN;
+                case ($value === '+'):
+                    return self::T_PLUS;
+                case ($value === '-'):
+                    return self::T_MINUS;
+                case ($value === '*'):
+                    return self::T_MULTIPLY;
+                case ($value === '/'):
+                    return self::T_DIVIDE;
+                case ($value === '!'):
+                    return self::T_NEGATE;
+                case ($value === '{'):
+                    return self::T_OPEN_CURLY_BRACE;
+                case ($value === '}'):
+                    return self::T_CLOSE_CURLY_BRACE;
+
+                // Default
+                default:
+                    // Do nothing
+            }
+
+            return $type;
+        }
+    }
+
+This is roughly what the DQL Parser looks like that uses the above
+Lexer implementation:
+
+.. note::
+
+    You can see the full implementation `here <https://github.com/doctrine/doctrine2/blob/master/lib/Doctrine/ORM/Query/Parser.php>`_.
+
+.. code-block:: php
+
+    class Parser
+    {
+        private $lexer;
+
+        public function __construct($dql)
+        {
+            $this->lexer = new Lexer();
+            $this->lexer->setInput($dql);
+        }
+
+        // ...
+
+        public function getAST()
+        {
+            // Parse & build AST
+            $AST = $this->QueryLanguage();
+
+            // ...
+
+            return $AST;
+        }
+
+        public function QueryLanguage()
+        {
+            $this->lexer->moveNext();
+
+            switch ($this->lexer->lookahead['type']) {
+                case Lexer::T_SELECT:
+                    $statement = $this->SelectStatement();
+                    break;
+                case Lexer::T_UPDATE:
+                    $statement = $this->UpdateStatement();
+                    break;
+                case Lexer::T_DELETE:
+                    $statement = $this->DeleteStatement();
+                    break;
+                default:
+                    $this->syntaxError('SELECT, UPDATE or DELETE');
+                    break;
+            }
+
+            // Check for end of string
+            if ($this->lexer->lookahead !== null) {
+                $this->syntaxError('end of string');
+            }
+
+            return $statement;
+        }
+
+        // ...
+    }
+
+Now the AST is used to transform the DQL query in to portable SQL for whatever relational
+database you are using!
+
+.. code-block:: php
+
+    $parser = new Parser('SELECT u FROM User u');
+    $AST = $parser->getAST(); // returns \Doctrine\ORM\Query\AST\SelectStatement
+
+What is an AST?
+===============
+
+AST stands for `Abstract syntax tree <http://en.wikipedia.org/wiki/Abstract_syntax_tree>`_.
+In computer science, an abstract syntax tree (AST), or just syntax tree, is a
+tree representation of the abstract syntactic structure of source code written
+in a programming language. Each node of the tree denotes a construct occurring in
+the source code.
diff --git a/lib/doctrine/lexer/docs/en/index.rst b/lib/doctrine/lexer/docs/en/index.rst
new file mode 100644
index 000000000..2aa985be1
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/index.rst
@@ -0,0 +1,53 @@
+Introduction
+============
+
+Doctrine Lexer is a library that can be used in Top-Down, Recursive
+Descent Parsers. This lexer is used in Doctrine Annotations and in
+Doctrine ORM (DQL).
+
+To write your own parser you just need to extend ``Doctrine\Common\Lexer\AbstractLexer``
+and implement the following three abstract methods.
+
+.. code-block:: php
+
+    /**
+     * Lexical catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getCatchablePatterns();
+
+    /**
+     * Lexical non-catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getNonCatchablePatterns();
+
+    /**
+     * Retrieve token type. Also processes the token value if necessary.
+     *
+     * @param string $value
+     * @return integer
+     */
+    abstract protected function getType(&$value);
+
+These methods define the `lexical <http://en.wikipedia.org/wiki/Lexical_analysis>`_
+catchable and non-catchable patterns and a method for returning the
+type of a token and filtering the value if necessary.
+
+The Lexer is responsible for giving you an API to walk across a
+string one character at a time and analyze the type of each character, value and position of
+each token in the string. The low level API of the lexer is pretty simple:
+
+- ``setInput($input)`` - Sets the input data to be tokenized. The Lexer is immediately reset and the new input tokenized.
+- ``reset()`` - Resets the lexer.
+- ``resetPeek()`` - Resets the peek pointer to 0.
+- ``resetPosition($position = 0)`` - Resets the lexer position on the input to the given position.
+- ``isNextToken($token)`` - Checks whether a given token matches the current lookahead.
+- ``isNextTokenAny(array $tokens)`` - Checks whether any of the given tokens matches the current lookahead.
+- ``moveNext()`` - Moves to the next token in the input string.
+- ``skipUntil($type)`` - Tells the lexer to skip input tokens until it sees a token with the given value.
+- ``isA($value, $token)`` - Checks if given value is identical to the given token.
+- ``peek()`` - Moves the lookahead token forward.
+- ``glimpse()`` - Peeks at the next token, returns it and immediately resets the peek.
diff --git a/lib/doctrine/lexer/docs/en/sidebar.rst b/lib/doctrine/lexer/docs/en/sidebar.rst
new file mode 100644
index 000000000..9b04e2447
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/sidebar.rst
@@ -0,0 +1,6 @@
+.. toctree::
+    :depth: 3
+
+    index
+    simple-parser-example
+    dql-parser
diff --git a/lib/doctrine/lexer/docs/en/simple-parser-example.rst b/lib/doctrine/lexer/docs/en/simple-parser-example.rst
new file mode 100644
index 000000000..ac142421d
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/simple-parser-example.rst
@@ -0,0 +1,102 @@
+Simple Parser Example
+=====================
+
+Extend the ``Doctrine\Common\Lexer\AbstractLexer`` class and implement
+the ``getCatchablePatterns``, ``getNonCatchablePatterns``, and ``getType``
+methods. Here is a very simple example lexer implementation named ``CharacterTypeLexer``.
+It tokenizes a string to ``T_UPPER``, ``T_LOWER`` and``T_NUMBER`` tokens:
+
+.. code-block:: php
+    <?php
+
+    use Doctrine\Common\Lexer\AbstractLexer;
+
+    class CharacterTypeLexer extends AbstractLexer
+    {
+        const T_UPPER =  1;
+        const T_LOWER =  2;
+        const T_NUMBER = 3;
+
+        protected function getCatchablePatterns()
+        {
+            return array(
+                '[a-bA-Z0-9]',
+            );
+        }
+
+        protected function getNonCatchablePatterns()
+        {
+            return array();
+        }
+
+        protected function getType(&$value)
+        {
+            if (is_numeric($value)) {
+                return self::T_NUMBER;
+            }
+
+            if (strtoupper($value) === $value) {
+                return self::T_UPPER;
+            }
+
+            if (strtolower($value) === $value) {
+                return self::T_LOWER;
+            }
+        }
+    }
+
+Use ``CharacterTypeLexer`` to extract an array of upper case characters:
+
+.. code-block:: php
+    <?php
+
+    class UpperCaseCharacterExtracter
+    {
+        private $lexer;
+
+        public function __construct(CharacterTypeLexer $lexer)
+        {
+            $this->lexer = $lexer;
+        }
+
+        public function getUpperCaseCharacters($string)
+        {
+            $this->lexer->setInput($string);
+            $this->lexer->moveNext();
+
+            $upperCaseChars = array();
+            while (true) {
+                if (!$this->lexer->lookahead) {
+                    break;
+                }
+
+                $this->lexer->moveNext();
+
+                if ($this->lexer->token['type'] === CharacterTypeLexer::T_UPPER) {
+                    $upperCaseChars[] = $this->lexer->token['value'];
+                }
+            }
+
+            return $upperCaseChars;
+        }
+    }
+
+    $upperCaseCharacterExtractor = new UpperCaseCharacterExtracter(new CharacterTypeLexer());
+    $upperCaseCharacters = $upperCaseCharacterExtractor->getUpperCaseCharacters('1aBcdEfgHiJ12');
+
+    print_r($upperCaseCharacters);
+
+The variable ``$upperCaseCharacters`` contains all of the upper case
+characters:
+
+.. code-block:: php
+    Array
+    (
+        [0] => B
+        [1] => E
+        [2] => H
+        [3] => J
+    )
+
+This is a simple example but it should demonstrate the low level API
+that can be used to build more complex parsers.
diff --git a/lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
new file mode 100644
index 000000000..317ff69d6
--- /dev/null
+++ b/lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
@@ -0,0 +1,332 @@
+<?php
+/*
+ * 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 software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Lexer;
+
+/**
+ * Base class for writing simple lexers, i.e. for creating small DSLs.
+ *
+ * @since  2.0
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
+ */
+abstract class AbstractLexer
+{
+    /**
+     * Lexer original input string.
+     *
+     * @var string
+     */
+    private $input;
+
+    /**
+     * Array of scanned tokens.
+     *
+     * Each token is an associative array containing three items:
+     *  - 'value'    : the string value of the token in the input string
+     *  - 'type'     : the type of the token (identifier, numeric, string, input
+     *                 parameter, none)
+     *  - 'position' : the position of the token in the input string
+     *
+     * @var array
+     */
+    private $tokens = array();
+
+    /**
+     * Current lexer position in input string.
+     *
+     * @var integer
+     */
+    private $position = 0;
+
+    /**
+     * Current peek of current lexer position.
+     *
+     * @var integer
+     */
+    private $peek = 0;
+
+    /**
+     * The next token in the input.
+     *
+     * @var array
+     */
+    public $lookahead;
+
+    /**
+     * The last matched/seen token.
+     *
+     * @var array
+     */
+    public $token;
+
+    /**
+     * Sets the input data to be tokenized.
+     *
+     * The Lexer is immediately reset and the new input tokenized.
+     * Any unprocessed tokens from any previous input are lost.
+     *
+     * @param string $input The input to be tokenized.
+     *
+     * @return void
+     */
+    public function setInput($input)
+    {
+        $this->input  = $input;
+        $this->tokens = array();
+
+        $this->reset();
+        $this->scan($input);
+    }
+
+    /**
+     * Resets the lexer.
+     *
+     * @return void
+     */
+    public function reset()
+    {
+        $this->lookahead = null;
+        $this->token = null;
+        $this->peek = 0;
+        $this->position = 0;
+    }
+
+    /**
+     * Resets the peek pointer to 0.
+     *
+     * @return void
+     */
+    public function resetPeek()
+    {
+        $this->peek = 0;
+    }
+
+    /**
+     * Resets the lexer position on the input to the given position.
+     *
+     * @param integer $position Position to place the lexical scanner.
+     *
+     * @return void
+     */
+    public function resetPosition($position = 0)
+    {
+        $this->position = $position;
+    }
+
+    /**
+     * Retrieve the original lexer's input until a given position.
+     *
+     * @param integer $position
+     *
+     * @return string
+     */
+    public function getInputUntilPosition($position)
+    {
+        return substr($this->input, 0, $position);
+    }
+
+    /**
+     * Checks whether a given token matches the current lookahead.
+     *
+     * @param integer|string $token
+     *
+     * @return boolean
+     */
+    public function isNextToken($token)
+    {
+        return null !== $this->lookahead && $this->lookahead['type'] === $token;
+    }
+
+    /**
+     * Checks whether any of the given tokens matches the current lookahead.
+     *
+     * @param array $tokens
+     *
+     * @return boolean
+     */
+    public function isNextTokenAny(array $tokens)
+    {
+        return null !== $this->lookahead && in_array($this->lookahead['type'], $tokens, true);
+    }
+
+    /**
+     * Moves to the next token in the input string.
+     *
+     * @return boolean
+     */
+    public function moveNext()
+    {
+        $this->peek = 0;
+        $this->token = $this->lookahead;
+        $this->lookahead = (isset($this->tokens[$this->position]))
+            ? $this->tokens[$this->position++] : null;
+
+        return $this->lookahead !== null;
+    }
+
+    /**
+     * Tells the lexer to skip input tokens until it sees a token with the given value.
+     *
+     * @param string $type The token type to skip until.
+     *
+     * @return void
+     */
+    public function skipUntil($type)
+    {
+        while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
+            $this->moveNext();
+        }
+    }
+
+    /**
+     * Checks if given value is identical to the given token.
+     *
+     * @param mixed   $value
+     * @param integer $token
+     *
+     * @return boolean
+     */
+    public function isA($value, $token)
+    {
+        return $this->getType($value) === $token;
+    }
+
+    /**
+     * Moves the lookahead token forward.
+     *
+     * @return array|null The next token or NULL if there are no more tokens ahead.
+     */
+    public function peek()
+    {
+        if (isset($this->tokens[$this->position + $this->peek])) {
+            return $this->tokens[$this->position + $this->peek++];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Peeks at the next token, returns it and immediately resets the peek.
+     *
+     * @return array|null The next token or NULL if there are no more tokens ahead.
+     */
+    public function glimpse()
+    {
+        $peek = $this->peek();
+        $this->peek = 0;
+        return $peek;
+    }
+
+    /**
+     * Scans the input string for tokens.
+     *
+     * @param string $input A query string.
+     *
+     * @return void
+     */
+    protected function scan($input)
+    {
+        static $regex;
+
+        if ( ! isset($regex)) {
+            $regex = sprintf(
+                '/(%s)|%s/%s',
+                implode(')|(', $this->getCatchablePatterns()),
+                implode('|', $this->getNonCatchablePatterns()),
+                $this->getModifiers()
+            );
+        }
+
+        $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
+        $matches = preg_split($regex, $input, -1, $flags);
+
+        if (false === $matches) {
+            // Work around https://bugs.php.net/78122
+            $matches = array(array($input, 0));
+        }
+
+        foreach ($matches as $match) {
+            // Must remain before 'value' assignment since it can change content
+            $type = $this->getType($match[0]);
+
+            $this->tokens[] = array(
+                'value' => $match[0],
+                'type'  => $type,
+                'position' => $match[1],
+            );
+        }
+    }
+
+    /**
+     * Gets the literal for a given token.
+     *
+     * @param integer $token
+     *
+     * @return string
+     */
+    public function getLiteral($token)
+    {
+        $className = get_class($this);
+        $reflClass = new \ReflectionClass($className);
+        $constants = $reflClass->getConstants();
+
+        foreach ($constants as $name => $value) {
+            if ($value === $token) {
+                return $className . '::' . $name;
+            }
+        }
+
+        return $token;
+    }
+
+    /**
+     * Regex modifiers
+     *
+     * @return string
+     */
+    protected function getModifiers()
+    {
+        return 'i';
+    }
+
+    /**
+     * Lexical catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getCatchablePatterns();
+
+    /**
+     * Lexical non-catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getNonCatchablePatterns();
+
+    /**
+     * Retrieve token type. Also processes the token value if necessary.
+     *
+     * @param string $value
+     *
+     * @return integer
+     */
+    abstract protected function getType(&$value);
+}
diff --git a/lib/doctrine/lexer/phpunit.xml.dist b/lib/doctrine/lexer/phpunit.xml.dist
new file mode 100644
index 000000000..d0a184669
--- /dev/null
+++ b/lib/doctrine/lexer/phpunit.xml.dist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         convertNoticesToExceptions="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine lexer Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">lib/Doctrine</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
new file mode 100644
index 000000000..8a2a4e49c
--- /dev/null
+++ b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
@@ -0,0 +1,268 @@
+<?php
+
+namespace Doctrine\Tests\Common\Lexer;
+
+class AbstractLexerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ConcreteLexer
+     */
+    private $concreteLexer;
+
+    public function setUp()
+    {
+        $this->concreteLexer = new ConcreteLexer();
+    }
+
+    public function dataProvider()
+    {
+        return array(
+            array(
+                'price=10',
+                array(
+                    array(
+                        'value' => 'price',
+                        'type' => 'string',
+                        'position' => 0,
+                    ),
+                    array(
+                        'value' => '=',
+                        'type' => 'operator',
+                        'position' => 5,
+                    ),
+                    array(
+                        'value' => 10,
+                        'type' => 'int',
+                        'position' => 6,
+                    ),
+                ),
+            ),
+        );
+    }
+
+    public function testResetPeek()
+    {
+        $expectedTokens = array(
+            array(
+                'value' => 'price',
+                'type' => 'string',
+                'position' => 0,
+            ),
+            array(
+                'value' => '=',
+                'type' => 'operator',
+                'position' => 5,
+            ),
+            array(
+                'value' => 10,
+                'type' => 'int',
+                'position' => 6,
+            ),
+        );
+
+        $this->concreteLexer->setInput('price=10');
+
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->peek());
+        $this->assertEquals($expectedTokens[1], $this->concreteLexer->peek());
+        $this->concreteLexer->resetPeek();
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->peek());
+    }
+
+    public function testResetPosition()
+    {
+        $expectedTokens = array(
+            array(
+                'value' => 'price',
+                'type' => 'string',
+                'position' => 0,
+            ),
+            array(
+                'value' => '=',
+                'type' => 'operator',
+                'position' => 5,
+            ),
+            array(
+                'value' => 10,
+                'type' => 'int',
+                'position' => 6,
+            ),
+        );
+
+        $this->concreteLexer->setInput('price=10');
+        $this->assertNull($this->concreteLexer->lookahead);
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->assertEquals($expectedTokens[1], $this->concreteLexer->lookahead);
+
+        $this->concreteLexer->resetPosition(0);
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testMoveNext($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+        $this->assertNull($this->concreteLexer->lookahead);
+
+        for ($i = 0; $i < count($expectedTokens); $i++) {
+            $this->assertTrue($this->concreteLexer->moveNext());
+            $this->assertEquals($expectedTokens[$i], $this->concreteLexer->lookahead);
+        }
+
+        $this->assertFalse($this->concreteLexer->moveNext());
+        $this->assertNull($this->concreteLexer->lookahead);
+    }
+
+    public function testSkipUntil()
+    {
+        $this->concreteLexer->setInput('price=10');
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->concreteLexer->skipUntil('operator');
+
+        $this->assertEquals(
+            array(
+                'value' => '=',
+                'type' => 'operator',
+                'position' => 5,
+            ),
+            $this->concreteLexer->lookahead
+        );
+    }
+
+    public function testUtf8Mismatch()
+    {
+        $this->concreteLexer->setInput("\xE9=10");
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+
+        $this->assertEquals(
+            array(
+                'value' => "\xE9=10",
+                'type' => 'string',
+                'position' => 0,
+            ),
+            $this->concreteLexer->lookahead
+        );
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testPeek($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+        foreach ($expectedTokens as $expectedToken) {
+            $this->assertEquals($expectedToken, $this->concreteLexer->peek());
+        }
+
+        $this->assertNull($this->concreteLexer->peek());
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testGlimpse($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+
+        foreach ($expectedTokens as $expectedToken) {
+            $this->assertEquals($expectedToken, $this->concreteLexer->glimpse());
+            $this->concreteLexer->moveNext();
+        }
+
+        $this->assertNull($this->concreteLexer->peek());
+    }
+
+    public function inputUntilPositionDataProvider()
+    {
+        return array(
+            array('price=10', 5, 'price'),
+        );
+    }
+
+    /**
+     * @dataProvider inputUntilPositionDataProvider
+     *
+     * @param $input
+     * @param $position
+     * @param $expectedInput
+     */
+    public function testGetInputUntilPosition($input, $position, $expectedInput)
+    {
+        $this->concreteLexer->setInput($input);
+
+        $this->assertSame($expectedInput, $this->concreteLexer->getInputUntilPosition($position));
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testIsNextToken($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+
+        $this->concreteLexer->moveNext();
+        for ($i = 0; $i < count($expectedTokens); $i++) {
+            $this->assertTrue($this->concreteLexer->isNextToken($expectedTokens[$i]['type']));
+            $this->concreteLexer->moveNext();
+        }
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testIsNextTokenAny($input, $expectedTokens)
+    {
+        $allTokenTypes = array_map(function ($token) {
+            return $token['type'];
+        }, $expectedTokens);
+
+        $this->concreteLexer->setInput($input);
+
+        $this->concreteLexer->moveNext();
+        for ($i = 0; $i < count($expectedTokens); $i++) {
+            $this->assertTrue($this->concreteLexer->isNextTokenAny(array($expectedTokens[$i]['type'])));
+            $this->assertTrue($this->concreteLexer->isNextTokenAny($allTokenTypes));
+            $this->concreteLexer->moveNext();
+        }
+    }
+
+    public function testGetLiteral()
+    {
+        $this->assertSame('Doctrine\Tests\Common\Lexer\ConcreteLexer::INT', $this->concreteLexer->getLiteral('int'));
+        $this->assertSame('fake_token', $this->concreteLexer->getLiteral('fake_token'));
+    }
+
+    public function testIsA()
+    {
+        $this->assertTrue($this->concreteLexer->isA(11, 'int'));
+        $this->assertTrue($this->concreteLexer->isA(1.1, 'int'));
+        $this->assertTrue($this->concreteLexer->isA('=', 'operator'));
+        $this->assertTrue($this->concreteLexer->isA('>', 'operator'));
+        $this->assertTrue($this->concreteLexer->isA('<', 'operator'));
+        $this->assertTrue($this->concreteLexer->isA('fake_text', 'string'));
+    }
+}
diff --git a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
new file mode 100644
index 000000000..ed4d153d1
--- /dev/null
+++ b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Doctrine\Tests\Common\Lexer;
+
+use Doctrine\Common\Lexer\AbstractLexer;
+
+class ConcreteLexer extends AbstractLexer
+{
+    const INT = 'int';
+
+    protected function getCatchablePatterns()
+    {
+        return array(
+            '=|<|>',
+            '[a-z]+',
+            '\d+',
+        );
+    }
+
+    protected function getNonCatchablePatterns()
+    {
+        return array(
+            '\s+',
+            '(.)',
+        );
+    }
+
+    protected function getType(&$value)
+    {
+        if (is_numeric($value)) {
+            $value = (int)$value;
+
+            return 'int';
+        }
+        if (in_array($value, array('=', '<', '>'))) {
+            return 'operator';
+        }
+        if (is_string($value)) {
+            return 'string';
+        }
+
+        return;
+    }
+
+    protected function getModifiers()
+    {
+        return parent::getModifiers().'u';
+    }
+}
diff --git a/lib/egulias/email-validator/LICENSE b/lib/egulias/email-validator/LICENSE
new file mode 100644
index 000000000..c34d2c197
--- /dev/null
+++ b/lib/egulias/email-validator/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2013-2016 Eduardo Gulias Davis
+
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/egulias/email-validator/composer.json b/lib/egulias/email-validator/composer.json
new file mode 100644
index 000000000..a275696ab
--- /dev/null
+++ b/lib/egulias/email-validator/composer.json
@@ -0,0 +1,38 @@
+{
+  "name":         "egulias/email-validator",
+  "description":  "A library for validating emails against several RFCs",
+  "homepage":     "https://github.com/egulias/EmailValidator",
+  "keywords":     ["email", "validation", "validator", "emailvalidation", "emailvalidator"],
+  "license":      "MIT",
+  "authors": [
+    {"name": "Eduardo Gulias Davis"}
+  ],
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.1.x-dev"
+    }
+  },
+  "require": {
+    "php": ">=5.5",
+    "doctrine/lexer": "^1.0.1",
+    "symfony/polyfill-intl-idn": "^1.10"
+  },
+  "require-dev": {
+    "dominicsayers/isemail": "^3.0.7",
+    "phpunit/phpunit": "^4.8.36|^7.5.15",
+    "satooshi/php-coveralls": "^1.0.1"
+  },
+  "suggest": {
+    "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+  },
+  "autoload": {
+    "psr-4": {
+      "Egulias\\EmailValidator\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Egulias\\EmailValidator\\Tests\\": "tests"
+    }
+  }
+}
diff --git a/lib/egulias/email-validator/src/EmailLexer.php b/lib/egulias/email-validator/src/EmailLexer.php
new file mode 100644
index 000000000..59dcd5876
--- /dev/null
+++ b/lib/egulias/email-validator/src/EmailLexer.php
@@ -0,0 +1,283 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+use Doctrine\Common\Lexer\AbstractLexer;
+
+class EmailLexer extends AbstractLexer
+{
+    //ASCII values
+    const C_DEL              = 127;
+    const C_NUL              = 0;
+    const S_AT               = 64;
+    const S_BACKSLASH        = 92;
+    const S_DOT              = 46;
+    const S_DQUOTE           = 34;
+    const S_SQUOTE           = 39;
+    const S_BACKTICK         = 96;
+    const S_OPENPARENTHESIS  = 49;
+    const S_CLOSEPARENTHESIS = 261;
+    const S_OPENBRACKET      = 262;
+    const S_CLOSEBRACKET     = 263;
+    const S_HYPHEN           = 264;
+    const S_COLON            = 265;
+    const S_DOUBLECOLON      = 266;
+    const S_SP               = 267;
+    const S_HTAB             = 268;
+    const S_CR               = 269;
+    const S_LF               = 270;
+    const S_IPV6TAG          = 271;
+    const S_LOWERTHAN        = 272;
+    const S_GREATERTHAN      = 273;
+    const S_COMMA            = 274;
+    const S_SEMICOLON        = 275;
+    const S_OPENQBRACKET     = 276;
+    const S_CLOSEQBRACKET    = 277;
+    const S_SLASH            = 278;
+    const S_EMPTY            = null;
+    const GENERIC            = 300;
+    const CRLF               = 301;
+    const INVALID            = 302;
+    const ASCII_INVALID_FROM = 127;
+    const ASCII_INVALID_TO   = 199;
+
+    /**
+     * US-ASCII visible characters not valid for atext (@link http://tools.ietf.org/html/rfc5322#section-3.2.3)
+     *
+     * @var array
+     */
+    protected $charValue = array(
+        '('    => self::S_OPENPARENTHESIS,
+        ')'    => self::S_CLOSEPARENTHESIS,
+        '<'    => self::S_LOWERTHAN,
+        '>'    => self::S_GREATERTHAN,
+        '['    => self::S_OPENBRACKET,
+        ']'    => self::S_CLOSEBRACKET,
+        ':'    => self::S_COLON,
+        ';'    => self::S_SEMICOLON,
+        '@'    => self::S_AT,
+        '\\'   => self::S_BACKSLASH,
+        '/'    => self::S_SLASH,
+        ','    => self::S_COMMA,
+        '.'    => self::S_DOT,
+        "'"    => self::S_SQUOTE,
+        "`"    => self::S_BACKTICK,
+        '"'    => self::S_DQUOTE,
+        '-'    => self::S_HYPHEN,
+        '::'   => self::S_DOUBLECOLON,
+        ' '    => self::S_SP,
+        "\t"   => self::S_HTAB,
+        "\r"   => self::S_CR,
+        "\n"   => self::S_LF,
+        "\r\n" => self::CRLF,
+        'IPv6' => self::S_IPV6TAG,
+        '{'    => self::S_OPENQBRACKET,
+        '}'    => self::S_CLOSEQBRACKET,
+        ''     => self::S_EMPTY,
+        '\0'   => self::C_NUL,
+    );
+
+    /**
+     * @var bool
+     */
+    protected $hasInvalidTokens = false;
+
+    /**
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
+     */
+    protected $previous = [];
+
+    /**
+     * The last matched/seen token.
+     *
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}
+     */
+    public $token;
+
+    /**
+     * The next token in the input.
+     *
+     * @var array|null
+     */
+    public $lookahead;
+
+    /**
+     * @psalm-var array{value:'', type:null, position:0}
+     */
+    private static $nullToken = [
+        'value' => '',
+        'type' => null,
+        'position' => 0,
+    ];
+
+    public function __construct()
+    {
+        $this->previous = $this->token = self::$nullToken;
+        $this->lookahead = null;
+    }
+
+    /**
+     * @return void
+     */
+    public function reset()
+    {
+        $this->hasInvalidTokens = false;
+        parent::reset();
+        $this->previous = $this->token = self::$nullToken;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasInvalidTokens()
+    {
+        return $this->hasInvalidTokens;
+    }
+
+    /**
+     * @param int $type
+     * @throws \UnexpectedValueException
+     * @return boolean
+     *
+     * @psalm-suppress InvalidScalarArgument
+     */
+    public function find($type)
+    {
+        $search = clone $this;
+        $search->skipUntil($type);
+
+        if (!$search->lookahead) {
+            throw new \UnexpectedValueException($type . ' not found');
+        }
+        return true;
+    }
+
+    /**
+     * getPrevious
+     *
+     * @return array
+     */
+    public function getPrevious()
+    {
+        return $this->previous;
+    }
+
+    /**
+     * moveNext
+     *
+     * @return boolean
+     */
+    public function moveNext()
+    {
+        $this->previous = $this->token;
+        $hasNext = parent::moveNext();
+        $this->token = $this->token ?: self::$nullToken;
+
+        return $hasNext;
+    }
+
+    /**
+     * Lexical catchable patterns.
+     *
+     * @return string[]
+     */
+    protected function getCatchablePatterns()
+    {
+        return array(
+            '[a-zA-Z_]+[46]?', //ASCII and domain literal
+            '[^\x00-\x7F]',  //UTF-8
+            '[0-9]+',
+            '\r\n',
+            '::',
+            '\s+?',
+            '.',
+            );
+    }
+
+    /**
+     * Lexical non-catchable patterns.
+     *
+     * @return string[]
+     */
+    protected function getNonCatchablePatterns()
+    {
+        return array('[\xA0-\xff]+');
+    }
+
+    /**
+     * Retrieve token type. Also processes the token value if necessary.
+     *
+     * @param string $value
+     * @throws \InvalidArgumentException
+     * @return integer
+     */
+    protected function getType(&$value)
+    {
+        if ($this->isNullType($value)) {
+            return self::C_NUL;
+        }
+
+        if ($this->isValid($value)) {
+            return $this->charValue[$value];
+        }
+
+        if ($this->isUTF8Invalid($value)) {
+            $this->hasInvalidTokens = true;
+            return self::INVALID;
+        }
+
+        return  self::GENERIC;
+    }
+
+    /**
+     * @param string $value
+     *
+     * @return bool
+     */
+    protected function isValid($value)
+    {
+        if (isset($this->charValue[$value])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    protected function isNullType($value)
+    {
+        if ($value === "\0") {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    protected function isUTF8Invalid($value)
+    {
+        if (preg_match('/\p{Cc}+/u', $value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getModifiers()
+    {
+        return 'iu';
+    }
+}
diff --git a/lib/egulias/email-validator/src/EmailParser.php b/lib/egulias/email-validator/src/EmailParser.php
new file mode 100644
index 000000000..6b7bad669
--- /dev/null
+++ b/lib/egulias/email-validator/src/EmailParser.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\NoLocalPart;
+use Egulias\EmailValidator\Parser\DomainPart;
+use Egulias\EmailValidator\Parser\LocalPart;
+use Egulias\EmailValidator\Warning\EmailTooLong;
+
+/**
+ * EmailParser
+ *
+ * @author Eduardo Gulias Davis <me@egulias.com>
+ */
+class EmailParser
+{
+    const EMAIL_MAX_LENGTH = 254;
+
+    /**
+     * @var array
+     */
+    protected $warnings = [];
+
+    /**
+     * @var string
+     */
+    protected $domainPart = '';
+
+    /**
+     * @var string
+     */
+    protected $localPart = '';
+    /**
+     * @var EmailLexer
+     */
+    protected $lexer;
+
+    /**
+     * @var LocalPart
+     */
+    protected $localPartParser;
+
+    /**
+     * @var DomainPart
+     */
+    protected $domainPartParser;
+
+    public function __construct(EmailLexer $lexer)
+    {
+        $this->lexer = $lexer;
+        $this->localPartParser = new LocalPart($this->lexer);
+        $this->domainPartParser = new DomainPart($this->lexer);
+    }
+
+    /**
+     * @param string $str
+     * @return array
+     */
+    public function parse($str)
+    {
+        $this->lexer->setInput($str);
+
+        if (!$this->hasAtToken()) {
+            throw new NoLocalPart();
+        }
+
+
+        $this->localPartParser->parse($str);
+        $this->domainPartParser->parse($str);
+
+        $this->setParts($str);
+
+        if ($this->lexer->hasInvalidTokens()) {
+            throw new ExpectingATEXT();
+        }
+
+        return array('local' => $this->localPart, 'domain' => $this->domainPart);
+    }
+
+    /**
+     * @return Warning\Warning[]
+     */
+    public function getWarnings()
+    {
+        $localPartWarnings = $this->localPartParser->getWarnings();
+        $domainPartWarnings = $this->domainPartParser->getWarnings();
+        $this->warnings = array_merge($localPartWarnings, $domainPartWarnings);
+
+        $this->addLongEmailWarning($this->localPart, $this->domainPart);
+
+        return $this->warnings;
+    }
+
+    /**
+     * @return string
+     */
+    public function getParsedDomainPart()
+    {
+        return $this->domainPart;
+    }
+
+    /**
+     * @param string $email
+     */
+    protected function setParts($email)
+    {
+        $parts = explode('@', $email);
+        $this->domainPart = $this->domainPartParser->getDomainPart();
+        $this->localPart = $parts[0];
+    }
+
+    /**
+     * @return bool
+     */
+    protected function hasAtToken()
+    {
+        $this->lexer->moveNext();
+        $this->lexer->moveNext();
+        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $localPart
+     * @param string $parsedDomainPart
+     */
+    protected function addLongEmailWarning($localPart, $parsedDomainPart)
+    {
+        if (strlen($localPart . '@' . $parsedDomainPart) > self::EMAIL_MAX_LENGTH) {
+            $this->warnings[EmailTooLong::CODE] = new EmailTooLong();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/EmailValidator.php b/lib/egulias/email-validator/src/EmailValidator.php
new file mode 100644
index 000000000..a30f21dcd
--- /dev/null
+++ b/lib/egulias/email-validator/src/EmailValidator.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Validation\EmailValidation;
+
+class EmailValidator
+{
+    /**
+     * @var EmailLexer
+     */
+    private $lexer;
+
+    /**
+     * @var Warning\Warning[]
+     */
+    protected $warnings = [];
+
+    /**
+     * @var InvalidEmail|null
+     */
+    protected $error;
+
+    public function __construct()
+    {
+        $this->lexer = new EmailLexer();
+    }
+
+    /**
+     * @param string          $email
+     * @param EmailValidation $emailValidation
+     * @return bool
+     */
+    public function isValid($email, EmailValidation $emailValidation)
+    {
+        $isValid = $emailValidation->isValid($email, $this->lexer);
+        $this->warnings = $emailValidation->getWarnings();
+        $this->error = $emailValidation->getError();
+
+        return $isValid;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasWarnings()
+    {
+        return !empty($this->warnings);
+    }
+
+    /**
+     * @return array
+     */
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+
+    /**
+     * @return InvalidEmail|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php b/lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php
new file mode 100644
index 000000000..97f41a2ca
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class AtextAfterCFWS extends InvalidEmail
+{
+    const CODE = 133;
+    const REASON = "ATEXT found after CFWS";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php b/lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php
new file mode 100644
index 000000000..ec23bc718
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CRLFAtTheEnd extends InvalidEmail
+{
+    const CODE = 149;
+    const REASON = "CRLF at the end";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CRLFX2.php b/lib/egulias/email-validator/src/Exception/CRLFX2.php
new file mode 100644
index 000000000..6bd377ee7
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CRLFX2.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CRLFX2 extends InvalidEmail
+{
+    const CODE = 148;
+    const REASON = "Folding whitespace CR LF found twice";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CRNoLF.php b/lib/egulias/email-validator/src/Exception/CRNoLF.php
new file mode 100644
index 000000000..9c9f73944
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CRNoLF.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CRNoLF extends InvalidEmail
+{
+    const CODE = 150;
+    const REASON = "Missing LF after CR";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CharNotAllowed.php b/lib/egulias/email-validator/src/Exception/CharNotAllowed.php
new file mode 100644
index 000000000..ea20ce591
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CharNotAllowed.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CharNotAllowed extends InvalidEmail
+{
+    const CODE = 201;
+    const REASON = "Non allowed character in domain";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CommaInDomain.php b/lib/egulias/email-validator/src/Exception/CommaInDomain.php
new file mode 100644
index 000000000..e9245d966
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CommaInDomain.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CommaInDomain extends InvalidEmail
+{
+    const CODE = 200;
+    const REASON = "Comma ',' is not allowed in domain part";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ConsecutiveAt.php b/lib/egulias/email-validator/src/Exception/ConsecutiveAt.php
new file mode 100644
index 000000000..165ff57a9
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ConsecutiveAt.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ConsecutiveAt extends InvalidEmail
+{
+    const CODE = 128;
+    const REASON = "Consecutive AT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ConsecutiveDot.php b/lib/egulias/email-validator/src/Exception/ConsecutiveDot.php
new file mode 100644
index 000000000..949af3b59
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ConsecutiveDot.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ConsecutiveDot extends InvalidEmail
+{
+    const CODE = 132;
+    const REASON = "Consecutive DOT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php b/lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php
new file mode 100644
index 000000000..40a99705c
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DomainAcceptsNoMail extends InvalidEmail
+{
+    const CODE = 154;
+    const REASON = 'Domain accepts no mail (Null MX, RFC7505)';
+}
\ No newline at end of file
diff --git a/lib/egulias/email-validator/src/Exception/DomainHyphened.php b/lib/egulias/email-validator/src/Exception/DomainHyphened.php
new file mode 100644
index 000000000..6f5868603
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DomainHyphened.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DomainHyphened extends InvalidEmail
+{
+    const CODE = 144;
+    const REASON = "Hyphen found in domain";
+}
diff --git a/lib/egulias/email-validator/src/Exception/DotAtEnd.php b/lib/egulias/email-validator/src/Exception/DotAtEnd.php
new file mode 100644
index 000000000..05ade77d0
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DotAtEnd.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DotAtEnd extends InvalidEmail
+{
+    const CODE = 142;
+    const REASON = "Dot at the end";
+}
diff --git a/lib/egulias/email-validator/src/Exception/DotAtStart.php b/lib/egulias/email-validator/src/Exception/DotAtStart.php
new file mode 100644
index 000000000..7772df7f8
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DotAtStart.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DotAtStart extends InvalidEmail
+{
+    const CODE = 141;
+    const REASON = "Found DOT at start";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingAT.php b/lib/egulias/email-validator/src/Exception/ExpectingAT.php
new file mode 100644
index 000000000..36d633c1a
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingAT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingAT extends InvalidEmail
+{
+    const CODE = 202;
+    const REASON = "Expecting AT '@' ";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingATEXT.php b/lib/egulias/email-validator/src/Exception/ExpectingATEXT.php
new file mode 100644
index 000000000..095d9db74
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingATEXT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingATEXT extends InvalidEmail
+{
+    const CODE = 137;
+    const REASON = "Expecting ATEXT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php b/lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php
new file mode 100644
index 000000000..63b870a4a
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingCTEXT extends InvalidEmail
+{
+    const CODE = 139;
+    const REASON = "Expecting CTEXT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php b/lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php
new file mode 100644
index 000000000..6a5bb9bfe
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingDTEXT extends InvalidEmail
+{
+    const CODE = 129;
+    const REASON = "Expected DTEXT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php b/lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php
new file mode 100644
index 000000000..81aad4277
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingDomainLiteralClose extends InvalidEmail
+{
+    const CODE = 137;
+    const REASON = "Closing bracket ']' for domain literal not found";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingQPair.php b/lib/egulias/email-validator/src/Exception/ExpectingQPair.php
new file mode 100644
index 000000000..a738eeb62
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingQPair.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingQPair extends InvalidEmail
+{
+    const CODE = 136;
+    const REASON = "Expecting QPAIR";
+}
diff --git a/lib/egulias/email-validator/src/Exception/InvalidEmail.php b/lib/egulias/email-validator/src/Exception/InvalidEmail.php
new file mode 100644
index 000000000..1c0218e9e
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/InvalidEmail.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+abstract class InvalidEmail extends \InvalidArgumentException
+{
+    const REASON = "Invalid email";
+    const CODE = 0;
+
+    public function __construct()
+    {
+        parent::__construct(static::REASON, static::CODE);
+    }
+}
diff --git a/lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php b/lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php
new file mode 100644
index 000000000..695b05a46
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class LocalOrReservedDomain extends InvalidEmail
+{
+    const CODE = 153;
+    const REASON = 'Local, mDNS or reserved domain (RFC2606, RFC6762)';
+}
\ No newline at end of file
diff --git a/lib/egulias/email-validator/src/Exception/NoDNSRecord.php b/lib/egulias/email-validator/src/Exception/NoDNSRecord.php
new file mode 100644
index 000000000..0aa5fa789
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/NoDNSRecord.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class NoDNSRecord extends InvalidEmail
+{
+    const CODE = 5;
+    const REASON = 'No MX or A DSN record was found for this email';
+}
diff --git a/lib/egulias/email-validator/src/Exception/NoDomainPart.php b/lib/egulias/email-validator/src/Exception/NoDomainPart.php
new file mode 100644
index 000000000..05a2604c0
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/NoDomainPart.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class NoDomainPart extends InvalidEmail
+{
+    const CODE = 131;
+    const REASON = "No Domain part";
+}
diff --git a/lib/egulias/email-validator/src/Exception/NoLocalPart.php b/lib/egulias/email-validator/src/Exception/NoLocalPart.php
new file mode 100644
index 000000000..07c14b844
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/NoLocalPart.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class NoLocalPart extends InvalidEmail
+{
+    const CODE = 130;
+    const REASON = "No local part";
+}
diff --git a/lib/egulias/email-validator/src/Exception/UnclosedComment.php b/lib/egulias/email-validator/src/Exception/UnclosedComment.php
new file mode 100644
index 000000000..86b2b0962
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/UnclosedComment.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class UnclosedComment extends InvalidEmail
+{
+    const CODE = 146;
+    const REASON = "No closing comment token found";
+}
diff --git a/lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php b/lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php
new file mode 100644
index 000000000..730a39dd3
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class UnclosedQuotedString extends InvalidEmail
+{
+    const CODE = 145;
+    const REASON = "Unclosed quoted string";
+}
diff --git a/lib/egulias/email-validator/src/Exception/UnopenedComment.php b/lib/egulias/email-validator/src/Exception/UnopenedComment.php
new file mode 100644
index 000000000..cff12d925
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/UnopenedComment.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class UnopenedComment extends InvalidEmail
+{
+    const CODE = 152;
+    const REASON = "No opening comment token found";
+}
diff --git a/lib/egulias/email-validator/src/Parser/DomainPart.php b/lib/egulias/email-validator/src/Parser/DomainPart.php
new file mode 100644
index 000000000..4dadba8af
--- /dev/null
+++ b/lib/egulias/email-validator/src/Parser/DomainPart.php
@@ -0,0 +1,443 @@
+<?php
+
+namespace Egulias\EmailValidator\Parser;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\CharNotAllowed;
+use Egulias\EmailValidator\Exception\CommaInDomain;
+use Egulias\EmailValidator\Exception\ConsecutiveAt;
+use Egulias\EmailValidator\Exception\CRLFAtTheEnd;
+use Egulias\EmailValidator\Exception\CRNoLF;
+use Egulias\EmailValidator\Exception\DomainHyphened;
+use Egulias\EmailValidator\Exception\DotAtEnd;
+use Egulias\EmailValidator\Exception\DotAtStart;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\ExpectingDomainLiteralClose;
+use Egulias\EmailValidator\Exception\ExpectingDTEXT;
+use Egulias\EmailValidator\Exception\NoDomainPart;
+use Egulias\EmailValidator\Exception\UnopenedComment;
+use Egulias\EmailValidator\Warning\AddressLiteral;
+use Egulias\EmailValidator\Warning\CFWSWithFWS;
+use Egulias\EmailValidator\Warning\DeprecatedComment;
+use Egulias\EmailValidator\Warning\DomainLiteral;
+use Egulias\EmailValidator\Warning\DomainTooLong;
+use Egulias\EmailValidator\Warning\IPV6BadChar;
+use Egulias\EmailValidator\Warning\IPV6ColonEnd;
+use Egulias\EmailValidator\Warning\IPV6ColonStart;
+use Egulias\EmailValidator\Warning\IPV6Deprecated;
+use Egulias\EmailValidator\Warning\IPV6DoubleColon;
+use Egulias\EmailValidator\Warning\IPV6GroupCount;
+use Egulias\EmailValidator\Warning\IPV6MaxGroups;
+use Egulias\EmailValidator\Warning\LabelTooLong;
+use Egulias\EmailValidator\Warning\ObsoleteDTEXT;
+use Egulias\EmailValidator\Warning\TLD;
+
+class DomainPart extends Parser
+{
+    const DOMAIN_MAX_LENGTH = 254;
+    const LABEL_MAX_LENGTH = 63;
+
+    /**
+     * @var string
+     */
+    protected $domainPart = '';
+
+    public function parse($domainPart)
+    {
+        $this->lexer->moveNext();
+
+        $this->performDomainStartChecks();
+
+        $domain = $this->doParseDomainPart();
+
+        $prev = $this->lexer->getPrevious();
+        $length = strlen($domain);
+
+        if ($prev['type'] === EmailLexer::S_DOT) {
+            throw new DotAtEnd();
+        }
+        if ($prev['type'] === EmailLexer::S_HYPHEN) {
+            throw new DomainHyphened();
+        }
+        if ($length > self::DOMAIN_MAX_LENGTH) {
+            $this->warnings[DomainTooLong::CODE] = new DomainTooLong();
+        }
+        if ($prev['type'] === EmailLexer::S_CR) {
+            throw new CRLFAtTheEnd();
+        }
+        $this->domainPart = $domain;
+    }
+
+    private function performDomainStartChecks()
+    {
+        $this->checkInvalidTokensAfterAT();
+        $this->checkEmptyDomain();
+
+        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
+            $this->parseDomainComments();
+        }
+    }
+
+    private function checkEmptyDomain()
+    {
+        $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
+            ($this->lexer->token['type'] === EmailLexer::S_SP &&
+            !$this->lexer->isNextToken(EmailLexer::GENERIC));
+
+        if ($thereIsNoDomain) {
+            throw new NoDomainPart();
+        }
+    }
+
+    private function checkInvalidTokensAfterAT()
+    {
+        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+            throw new DotAtStart();
+        }
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+            throw new DomainHyphened();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getDomainPart()
+    {
+        return $this->domainPart;
+    }
+
+    /**
+     * @param string $addressLiteral
+     * @param int $maxGroups
+     */
+    public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
+    {
+        $prev = $this->lexer->getPrevious();
+        if ($prev['type'] === EmailLexer::S_COLON) {
+            $this->warnings[IPV6ColonEnd::CODE] = new IPV6ColonEnd();
+        }
+
+        $IPv6       = substr($addressLiteral, 5);
+        //Daniel Marschall's new IPv6 testing strategy
+        $matchesIP  = explode(':', $IPv6);
+        $groupCount = count($matchesIP);
+        $colons     = strpos($IPv6, '::');
+
+        if (count(preg_grep('/^[0-9A-Fa-f]{0,4}$/', $matchesIP, PREG_GREP_INVERT)) !== 0) {
+            $this->warnings[IPV6BadChar::CODE] = new IPV6BadChar();
+        }
+
+        if ($colons === false) {
+            // We need exactly the right number of groups
+            if ($groupCount !== $maxGroups) {
+                $this->warnings[IPV6GroupCount::CODE] = new IPV6GroupCount();
+            }
+            return;
+        }
+
+        if ($colons !== strrpos($IPv6, '::')) {
+            $this->warnings[IPV6DoubleColon::CODE] = new IPV6DoubleColon();
+            return;
+        }
+
+        if ($colons === 0 || $colons === (strlen($IPv6) - 2)) {
+            // RFC 4291 allows :: at the start or end of an address
+            //with 7 other groups in addition
+            ++$maxGroups;
+        }
+
+        if ($groupCount > $maxGroups) {
+            $this->warnings[IPV6MaxGroups::CODE] = new IPV6MaxGroups();
+        } elseif ($groupCount === $maxGroups) {
+            $this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function doParseDomainPart()
+    {
+        $domain = '';
+        $label = '';
+        $openedParenthesis = 0;
+        do {
+            $prev = $this->lexer->getPrevious();
+
+            $this->checkNotAllowedChars($this->lexer->token);
+
+            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+                $this->parseComments();
+                $openedParenthesis += $this->getOpenedParenthesis();
+                $this->lexer->moveNext();
+                $tmpPrev = $this->lexer->getPrevious();
+                if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                    $openedParenthesis--;
+                }
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                if ($openedParenthesis === 0) {
+                    throw new UnopenedComment();
+                } else {
+                    $openedParenthesis--;
+                }
+            }
+
+            $this->checkConsecutiveDots();
+            $this->checkDomainPartExceptions($prev);
+
+            if ($this->hasBrackets()) {
+                $this->parseDomainLiteral();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+                $this->checkLabelLength($label);
+                $label = '';
+            } else {
+                $label .= $this->lexer->token['value'];
+            }
+
+            if ($this->isFWS()) {
+                $this->parseFWS();
+            }
+
+            $domain .= $this->lexer->token['value'];
+            $this->lexer->moveNext();
+            if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+                throw new CharNotAllowed();
+            }
+        } while (null !== $this->lexer->token['type']);
+
+        $this->checkLabelLength($label);
+
+        return $domain;
+    }
+
+    private function checkNotAllowedChars(array $token)
+    {
+        $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
+        if (isset($notAllowed[$token['type']])) {
+            throw new CharNotAllowed();
+        }
+    }
+
+    /**
+     * @return string|false
+     */
+    protected function parseDomainLiteral()
+    {
+        if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
+            $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+        }
+        if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
+            $lexer = clone $this->lexer;
+            $lexer->moveNext();
+            if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
+                $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+            }
+        }
+
+        return $this->doParseDomainLiteral();
+    }
+
+    /**
+     * @return string|false
+     */
+    protected function doParseDomainLiteral()
+    {
+        $IPv6TAG = false;
+        $addressLiteral = '';
+        do {
+            if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
+                throw new ExpectingDTEXT();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::INVALID ||
+                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
+                $this->lexer->token['type'] === EmailLexer::S_LF
+            ) {
+                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+            }
+
+            if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
+                throw new ExpectingDTEXT();
+            }
+
+            if ($this->lexer->isNextTokenAny(
+                array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
+            )) {
+                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+                $this->parseFWS();
+            }
+
+            if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
+                throw new CRNoLF();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
+                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+                $addressLiteral .= $this->lexer->token['value'];
+                $this->lexer->moveNext();
+                $this->validateQuotedPair();
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
+                $IPv6TAG = true;
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEQBRACKET) {
+                break;
+            }
+
+            $addressLiteral .= $this->lexer->token['value'];
+
+        } while ($this->lexer->moveNext());
+
+        $addressLiteral = str_replace('[', '', $addressLiteral);
+        $addressLiteral = $this->checkIPV4Tag($addressLiteral);
+
+        if (false === $addressLiteral) {
+            return $addressLiteral;
+        }
+
+        if (!$IPv6TAG) {
+            $this->warnings[DomainLiteral::CODE] = new DomainLiteral();
+            return $addressLiteral;
+        }
+
+        $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+
+        $this->checkIPV6Tag($addressLiteral);
+
+        return $addressLiteral;
+    }
+
+    /**
+     * @param string $addressLiteral
+     *
+     * @return string|false
+     */
+    protected function checkIPV4Tag($addressLiteral)
+    {
+        $matchesIP  = array();
+
+        // Extract IPv4 part from the end of the address-literal (if there is one)
+        if (preg_match(
+            '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/',
+            $addressLiteral,
+            $matchesIP
+        ) > 0
+        ) {
+            $index = strrpos($addressLiteral, $matchesIP[0]);
+            if ($index === 0) {
+                $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+                return false;
+            }
+            // Convert IPv4 part to IPv6 format for further testing
+            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
+        }
+
+        return $addressLiteral;
+    }
+
+    protected function checkDomainPartExceptions(array $prev)
+    {
+        $invalidDomainTokens = array(
+            EmailLexer::S_DQUOTE => true,
+            EmailLexer::S_SQUOTE => true,
+            EmailLexer::S_BACKTICK => true,
+            EmailLexer::S_SEMICOLON => true,
+            EmailLexer::S_GREATERTHAN => true,
+            EmailLexer::S_LOWERTHAN => true,
+        );
+
+        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
+            throw new ExpectingATEXT();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
+            throw new CommaInDomain();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
+            throw new ConsecutiveAt();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
+            throw new ExpectingATEXT();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+            throw new DomainHyphened();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
+            && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
+            throw new ExpectingATEXT();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function hasBrackets()
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
+            return false;
+        }
+
+        try {
+            $this->lexer->find(EmailLexer::S_CLOSEBRACKET);
+        } catch (\RuntimeException $e) {
+            throw new ExpectingDomainLiteralClose();
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $label
+     */
+    protected function checkLabelLength($label)
+    {
+        if ($this->isLabelTooLong($label)) {
+            $this->warnings[LabelTooLong::CODE] = new LabelTooLong();
+        }
+    }
+
+    /**
+     * @param string $label
+     * @return bool
+     */
+    private function isLabelTooLong($label)
+    {
+        if (preg_match('/[^\x00-\x7F]/', $label)) {
+            idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
+
+            return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
+        }
+
+        return strlen($label) > self::LABEL_MAX_LENGTH;
+    }
+
+    protected function parseDomainComments()
+    {
+        $this->isUnclosedComment();
+        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+            $this->warnEscaping();
+            $this->lexer->moveNext();
+        }
+
+        $this->lexer->moveNext();
+        if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
+            throw new ExpectingATEXT();
+        }
+    }
+
+    protected function addTLDWarnings()
+    {
+        if ($this->warnings[DomainLiteral::CODE]) {
+            $this->warnings[TLD::CODE] = new TLD();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/Parser/LocalPart.php b/lib/egulias/email-validator/src/Parser/LocalPart.php
new file mode 100644
index 000000000..3c21f34ac
--- /dev/null
+++ b/lib/egulias/email-validator/src/Parser/LocalPart.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Egulias\EmailValidator\Parser;
+
+use Egulias\EmailValidator\Exception\DotAtEnd;
+use Egulias\EmailValidator\Exception\DotAtStart;
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\ExpectingAT;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\UnclosedQuotedString;
+use Egulias\EmailValidator\Exception\UnopenedComment;
+use Egulias\EmailValidator\Warning\CFWSWithFWS;
+use Egulias\EmailValidator\Warning\LocalTooLong;
+
+class LocalPart extends Parser
+{
+    public function parse($localPart)
+    {
+        $parseDQuote = true;
+        $closingQuote = false;
+        $openedParenthesis = 0;
+        $totalLength = 0;
+
+        while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
+                throw new DotAtStart();
+            }
+
+            $closingQuote = $this->checkDQUOTE($closingQuote);
+            if ($closingQuote && $parseDQuote) {
+                $parseDQuote = $this->parseDoubleQuote();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+                $this->parseComments();
+                $openedParenthesis += $this->getOpenedParenthesis();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                if ($openedParenthesis === 0) {
+                    throw new UnopenedComment();
+                }
+
+                $openedParenthesis--;
+            }
+
+            $this->checkConsecutiveDots();
+
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
+                $this->lexer->isNextToken(EmailLexer::S_AT)
+            ) {
+                throw new DotAtEnd();
+            }
+
+            $this->warnEscaping();
+            $this->isInvalidToken($this->lexer->token, $closingQuote);
+
+            if ($this->isFWS()) {
+                $this->parseFWS();
+            }
+
+            $totalLength += strlen($this->lexer->token['value']);
+            $this->lexer->moveNext();
+        }
+
+        if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
+            $this->warnings[LocalTooLong::CODE] = new LocalTooLong();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function parseDoubleQuote()
+    {
+        $parseAgain = true;
+        $special = array(
+            EmailLexer::S_CR => true,
+            EmailLexer::S_HTAB => true,
+            EmailLexer::S_LF => true
+        );
+
+        $invalid = array(
+            EmailLexer::C_NUL => true,
+            EmailLexer::S_HTAB => true,
+            EmailLexer::S_CR => true,
+            EmailLexer::S_LF => true
+        );
+        $setSpecialsWarning = true;
+
+        $this->lexer->moveNext();
+
+        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
+            $parseAgain = false;
+            if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
+                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+                $setSpecialsWarning = false;
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
+                $this->lexer->moveNext();
+            }
+
+            $this->lexer->moveNext();
+
+            if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
+                throw new ExpectingATEXT();
+            }
+        }
+
+        $prev = $this->lexer->getPrevious();
+
+        if ($prev['type'] === EmailLexer::S_BACKSLASH) {
+            if (!$this->checkDQUOTE(false)) {
+                throw new UnclosedQuotedString();
+            }
+        }
+
+        if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
+            throw new ExpectingAT();
+        }
+
+        return $parseAgain;
+    }
+
+    /**
+     * @param bool $closingQuote
+     */
+    protected function isInvalidToken(array $token, $closingQuote)
+    {
+        $forbidden = array(
+            EmailLexer::S_COMMA,
+            EmailLexer::S_CLOSEBRACKET,
+            EmailLexer::S_OPENBRACKET,
+            EmailLexer::S_GREATERTHAN,
+            EmailLexer::S_LOWERTHAN,
+            EmailLexer::S_COLON,
+            EmailLexer::S_SEMICOLON,
+            EmailLexer::INVALID
+        );
+
+        if (in_array($token['type'], $forbidden) && !$closingQuote) {
+            throw new ExpectingATEXT();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/Parser/Parser.php b/lib/egulias/email-validator/src/Parser/Parser.php
new file mode 100644
index 000000000..ccdc93889
--- /dev/null
+++ b/lib/egulias/email-validator/src/Parser/Parser.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace Egulias\EmailValidator\Parser;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\AtextAfterCFWS;
+use Egulias\EmailValidator\Exception\ConsecutiveDot;
+use Egulias\EmailValidator\Exception\CRLFAtTheEnd;
+use Egulias\EmailValidator\Exception\CRLFX2;
+use Egulias\EmailValidator\Exception\CRNoLF;
+use Egulias\EmailValidator\Exception\ExpectingQPair;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\ExpectingCTEXT;
+use Egulias\EmailValidator\Exception\UnclosedComment;
+use Egulias\EmailValidator\Exception\UnclosedQuotedString;
+use Egulias\EmailValidator\Warning\CFWSNearAt;
+use Egulias\EmailValidator\Warning\CFWSWithFWS;
+use Egulias\EmailValidator\Warning\Comment;
+use Egulias\EmailValidator\Warning\QuotedPart;
+use Egulias\EmailValidator\Warning\QuotedString;
+
+abstract class Parser
+{
+    /**
+     * @var array
+     */
+    protected $warnings = [];
+
+    /**
+     * @var EmailLexer
+     */
+    protected $lexer;
+
+    /**
+     * @var int
+     */
+    protected $openedParenthesis = 0;
+
+    public function __construct(EmailLexer $lexer)
+    {
+        $this->lexer = $lexer;
+    }
+
+    /**
+     * @return \Egulias\EmailValidator\Warning\Warning[]
+     */
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+
+    /**
+     * @param string $str
+     */
+    abstract public function parse($str);
+
+    /** @return int */
+    public function getOpenedParenthesis()
+    {
+        return $this->openedParenthesis;
+    }
+
+    /**
+     * validateQuotedPair
+     */
+    protected function validateQuotedPair()
+    {
+        if (!($this->lexer->token['type'] === EmailLexer::INVALID
+            || $this->lexer->token['type'] === EmailLexer::C_DEL)) {
+            throw new ExpectingQPair();
+        }
+
+        $this->warnings[QuotedPart::CODE] =
+            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+    }
+
+    protected function parseComments()
+    {
+        $this->openedParenthesis = 1;
+        $this->isUnclosedComment();
+        $this->warnings[Comment::CODE] = new Comment();
+        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+            if ($this->lexer->isNextToken(EmailLexer::S_OPENPARENTHESIS)) {
+                $this->openedParenthesis++;
+            }
+            $this->warnEscaping();
+            $this->lexer->moveNext();
+        }
+
+        $this->lexer->moveNext();
+        if ($this->lexer->isNextTokenAny(array(EmailLexer::GENERIC, EmailLexer::S_EMPTY))) {
+            throw new ExpectingATEXT();
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::S_AT)) {
+            $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isUnclosedComment()
+    {
+        try {
+            $this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
+            return true;
+        } catch (\RuntimeException $e) {
+            throw new UnclosedComment();
+        }
+    }
+
+    protected function parseFWS()
+    {
+        $previous = $this->lexer->getPrevious();
+
+        $this->checkCRLFInFWS();
+
+        if ($this->lexer->token['type'] === EmailLexer::S_CR) {
+            throw new CRNoLF();
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
+            throw new AtextAfterCFWS();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
+            throw new ExpectingCTEXT();
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type']  === EmailLexer::S_AT) {
+            $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
+        } else {
+            $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+        }
+    }
+
+    protected function checkConsecutiveDots()
+    {
+        if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+            throw new ConsecutiveDot();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isFWS()
+    {
+        if ($this->escaped()) {
+            return false;
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_SP ||
+            $this->lexer->token['type'] === EmailLexer::S_HTAB ||
+            $this->lexer->token['type'] === EmailLexer::S_CR ||
+            $this->lexer->token['type'] === EmailLexer::S_LF ||
+            $this->lexer->token['type'] === EmailLexer::CRLF
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function escaped()
+    {
+        $previous = $this->lexer->getPrevious();
+
+        if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
+            &&
+            $this->lexer->token['type'] !== EmailLexer::GENERIC
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function warnEscaping()
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+            return false;
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
+            throw new ExpectingATEXT();
+        }
+
+        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
+            return false;
+        }
+
+        $this->warnings[QuotedPart::CODE] =
+            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+        return true;
+
+    }
+
+    /**
+     * @param bool $hasClosingQuote
+     *
+     * @return bool
+     */
+    protected function checkDQUOTE($hasClosingQuote)
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
+            return $hasClosingQuote;
+        }
+        if ($hasClosingQuote) {
+            return $hasClosingQuote;
+        }
+        $previous = $this->lexer->getPrevious();
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
+            throw new ExpectingATEXT();
+        }
+
+        try {
+            $this->lexer->find(EmailLexer::S_DQUOTE);
+            $hasClosingQuote = true;
+        } catch (\Exception $e) {
+            throw new UnclosedQuotedString();
+        }
+        $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], $this->lexer->token['value']);
+
+        return $hasClosingQuote;
+    }
+
+    protected function checkCRLFInFWS()
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
+            return;
+        }
+
+        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
+            throw new CRLFX2();
+        }
+
+        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
+            throw new CRLFAtTheEnd();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/DNSCheckValidation.php b/lib/egulias/email-validator/src/Validation/DNSCheckValidation.php
new file mode 100644
index 000000000..491082a59
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/DNSCheckValidation.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Exception\LocalOrReservedDomain;
+use Egulias\EmailValidator\Exception\DomainAcceptsNoMail;
+use Egulias\EmailValidator\Warning\NoDNSMXRecord;
+use Egulias\EmailValidator\Exception\NoDNSRecord;
+
+class DNSCheckValidation implements EmailValidation
+{
+    /**
+     * @var array
+     */
+    private $warnings = [];
+
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    /**
+     * @var array
+     */
+    private $mxRecords = [];
+
+
+    public function __construct()
+    {
+        if (!function_exists('idn_to_ascii')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
+
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        // use the input to check DNS if we cannot extract something similar to a domain
+        $host = $email;
+
+        // Arguable pattern to extract the domain. Not aiming to validate the domain nor the email
+        if (false !== $lastAtPos = strrpos($email, '@')) {
+            $host = substr($email, $lastAtPos + 1);
+        }
+
+        // Get the domain parts
+        $hostParts = explode('.', $host);
+
+        // Reserved Top Level DNS Names (https://tools.ietf.org/html/rfc2606#section-2),
+        // mDNS and private DNS Namespaces (https://tools.ietf.org/html/rfc6762#appendix-G)
+        $reservedTopLevelDnsNames = [
+            // Reserved Top Level DNS Names
+            'test',
+            'example',
+            'invalid',
+            'localhost',
+
+            // mDNS
+            'local',
+
+            // Private DNS Namespaces
+            'intranet',
+            'internal',
+            'private',
+            'corp',
+            'home',
+            'lan',
+        ];
+
+        $isLocalDomain = count($hostParts) <= 1;
+        $isReservedTopLevel = in_array($hostParts[(count($hostParts) - 1)], $reservedTopLevelDnsNames, true);
+
+        // Exclude reserved top level DNS names
+        if ($isLocalDomain || $isReservedTopLevel) {
+            $this->error = new LocalOrReservedDomain();
+            return false;
+        }
+
+        return $this->checkDns($host);
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+
+    /**
+     * @param string $host
+     *
+     * @return bool
+     */
+    protected function checkDns($host)
+    {
+        $variant = INTL_IDNA_VARIANT_UTS46;
+
+        $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, $variant), '.') . '.';
+
+        return $this->validateDnsRecords($host);
+    }
+
+
+    /**
+     * Validate the DNS records for given host.
+     *
+     * @param string $host A set of DNS records in the format returned by dns_get_record.
+     *
+     * @return bool True on success.
+     */
+    private function validateDnsRecords($host)
+    {
+        // Get all MX, A and AAAA DNS records for host
+        // Using @ as workaround to fix https://bugs.php.net/bug.php?id=73149
+        $dnsRecords = @dns_get_record($host, DNS_MX + DNS_A + DNS_AAAA);
+
+
+        // No MX, A or AAAA DNS records
+        if (empty($dnsRecords)) {
+            $this->error = new NoDNSRecord();
+            return false;
+        }
+
+        // For each DNS record
+        foreach ($dnsRecords as $dnsRecord) {
+            if (!$this->validateMXRecord($dnsRecord)) {
+                return false;
+            }
+        }
+
+        // No MX records (fallback to A or AAAA records)
+        if (empty($this->mxRecords)) {
+            $this->warnings[NoDNSMXRecord::CODE] = new NoDNSMXRecord();
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate an MX record
+     *
+     * @param array $dnsRecord Given DNS record.
+     *
+     * @return bool True if valid.
+     */
+    private function validateMxRecord($dnsRecord)
+    {
+        if ($dnsRecord['type'] !== 'MX') {
+            return true;
+        }
+
+        // "Null MX" record indicates the domain accepts no mail (https://tools.ietf.org/html/rfc7505)
+        if (empty($dnsRecord['target']) || $dnsRecord['target'] === '.') {
+            $this->error = new DomainAcceptsNoMail();
+            return false;
+        }
+
+        $this->mxRecords[] = $dnsRecord;
+
+        return true;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/EmailValidation.php b/lib/egulias/email-validator/src/Validation/EmailValidation.php
new file mode 100644
index 000000000..d5a015be5
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/EmailValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Warning\Warning;
+
+interface EmailValidation
+{
+    /**
+     * Returns true if the given email is valid.
+     *
+     * @param string     $email      The email you want to validate.
+     * @param EmailLexer $emailLexer The email lexer.
+     *
+     * @return bool
+     */
+    public function isValid($email, EmailLexer $emailLexer);
+
+    /**
+     * Returns the validation error.
+     *
+     * @return InvalidEmail|null
+     */
+    public function getError();
+
+    /**
+     * Returns the validation warnings.
+     *
+     * @return Warning[]
+     */
+    public function getWarnings();
+}
diff --git a/lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php b/lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php
new file mode 100644
index 000000000..7f2256d60
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation\Error;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class RFCWarnings extends InvalidEmail
+{
+    const CODE = 997;
+    const REASON = 'Warnings were found.';
+}
diff --git a/lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php b/lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php
new file mode 100644
index 000000000..8c92cb5ae
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation\Error;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class SpoofEmail extends InvalidEmail
+{
+    const CODE = 998;
+    const REASON = "The email contains mixed UTF8 chars that makes it suspicious";
+}
diff --git a/lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php b/lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
new file mode 100644
index 000000000..ee7c41aa0
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation\Exception;
+
+use Exception;
+
+class EmptyValidationList extends \InvalidArgumentException
+{
+    /**
+    * @param int $code
+    */
+    public function __construct($code = 0, Exception $previous = null)
+    {
+        parent::__construct("Empty validation list is not allowed", $code, $previous);
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/MultipleErrors.php b/lib/egulias/email-validator/src/Validation/MultipleErrors.php
new file mode 100644
index 000000000..3be597326
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/MultipleErrors.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class MultipleErrors extends InvalidEmail
+{
+    const CODE = 999;
+    const REASON = "Accumulated errors for multiple validations";
+    /**
+     * @var InvalidEmail[]
+     */
+    private $errors = [];
+
+    /**
+     * @param InvalidEmail[] $errors
+     */
+    public function __construct(array $errors)
+    {
+        $this->errors = $errors;
+        parent::__construct();
+    }
+
+    /**
+     * @return InvalidEmail[]
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php b/lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
new file mode 100644
index 000000000..feb224023
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Validation\Exception\EmptyValidationList;
+
+class MultipleValidationWithAnd implements EmailValidation
+{
+    /**
+     * If one of validations gets failure skips all succeeding validation.
+     * This means MultipleErrors will only contain a single error which first found.
+     */
+    const STOP_ON_ERROR = 0;
+
+    /**
+     * All of validations will be invoked even if one of them got failure.
+     * So MultipleErrors will contain all causes.
+     */
+    const ALLOW_ALL_ERRORS = 1;
+
+    /**
+     * @var EmailValidation[]
+     */
+    private $validations = [];
+
+    /**
+     * @var array
+     */
+    private $warnings = [];
+
+    /**
+     * @var MultipleErrors|null
+     */
+    private $error;
+
+    /**
+     * @var int
+     */
+    private $mode;
+
+    /**
+     * @param EmailValidation[] $validations The validations.
+     * @param int               $mode        The validation mode (one of the constants).
+     */
+    public function __construct(array $validations, $mode = self::ALLOW_ALL_ERRORS)
+    {
+        if (count($validations) == 0) {
+            throw new EmptyValidationList();
+        }
+
+        $this->validations = $validations;
+        $this->mode = $mode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        $result = true;
+        $errors = [];
+        foreach ($this->validations as $validation) {
+            $emailLexer->reset();
+            $validationResult = $validation->isValid($email, $emailLexer);
+            $result = $result && $validationResult;
+            $this->warnings = array_merge($this->warnings, $validation->getWarnings());
+            $errors = $this->addNewError($validation->getError(), $errors);
+
+            if ($this->shouldStop($result)) {
+                break;
+            }
+        }
+
+        if (!empty($errors)) {
+            $this->error = new MultipleErrors($errors);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail|null $possibleError
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail[] $errors
+     *
+     * @return \Egulias\EmailValidator\Exception\InvalidEmail[]
+     */
+    private function addNewError($possibleError, array $errors)
+    {
+        if (null !== $possibleError) {
+            $errors[] = $possibleError;
+        }
+
+        return $errors;
+    }
+
+    /**
+     * @param bool $result
+     *
+     * @return bool
+     */
+    private function shouldStop($result)
+    {
+        return !$result && $this->mode === self::STOP_ON_ERROR;
+    }
+
+    /**
+     * Returns the validation errors.
+     *
+     * @return MultipleErrors|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php b/lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php
new file mode 100644
index 000000000..6b31e5440
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Validation\Error\RFCWarnings;
+
+class NoRFCWarningsValidation extends RFCValidation
+{
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        if (!parent::isValid($email, $emailLexer)) {
+            return false;
+        }
+
+        if (empty($this->getWarnings())) {
+            return true;
+        }
+
+        $this->error = new RFCWarnings();
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getError()
+    {
+        return $this->error ?: parent::getError();
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/RFCValidation.php b/lib/egulias/email-validator/src/Validation/RFCValidation.php
new file mode 100644
index 000000000..8781e0b62
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/RFCValidation.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\EmailParser;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class RFCValidation implements EmailValidation
+{
+    /**
+     * @var EmailParser|null
+     */
+    private $parser;
+
+    /**
+     * @var array
+     */
+    private $warnings = [];
+
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        $this->parser = new EmailParser($emailLexer);
+        try {
+            $this->parser->parse((string)$email);
+        } catch (InvalidEmail $invalid) {
+            $this->error = $invalid;
+            return false;
+        }
+
+        $this->warnings = $this->parser->getWarnings();
+        return true;
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php b/lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php
new file mode 100644
index 000000000..e10bfabd9
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Validation\Error\SpoofEmail;
+use \Spoofchecker;
+
+class SpoofCheckValidation implements EmailValidation
+{
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
+
+    /**
+     * @psalm-suppress InvalidArgument
+     */
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        $checker = new Spoofchecker();
+        $checker->setChecks(Spoofchecker::SINGLE_SCRIPT);
+
+        if ($checker->isSuspicious($email)) {
+            $this->error = new SpoofEmail();
+        }
+
+        return $this->error === null;
+    }
+
+    /**
+     * @return InvalidEmail|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getWarnings()
+    {
+        return [];
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/AddressLiteral.php b/lib/egulias/email-validator/src/Warning/AddressLiteral.php
new file mode 100644
index 000000000..77e70f7f5
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/AddressLiteral.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class AddressLiteral extends Warning
+{
+    const CODE = 12;
+
+    public function __construct()
+    {
+        $this->message = 'Address literal in domain part';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/CFWSNearAt.php b/lib/egulias/email-validator/src/Warning/CFWSNearAt.php
new file mode 100644
index 000000000..be43bbe6f
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/CFWSNearAt.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class CFWSNearAt extends Warning
+{
+    const CODE = 49;
+
+    public function __construct()
+    {
+        $this->message = "Deprecated folding white space near @";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/CFWSWithFWS.php b/lib/egulias/email-validator/src/Warning/CFWSWithFWS.php
new file mode 100644
index 000000000..dea3450ec
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/CFWSWithFWS.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class CFWSWithFWS extends Warning
+{
+    const CODE = 18;
+
+    public function __construct()
+    {
+        $this->message = 'Folding whites space followed by folding white space';
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/Comment.php b/lib/egulias/email-validator/src/Warning/Comment.php
new file mode 100644
index 000000000..704c2908b
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/Comment.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class Comment extends Warning
+{
+    const CODE = 17;
+
+    public function __construct()
+    {
+        $this->message = "Comments found in this email";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/DeprecatedComment.php b/lib/egulias/email-validator/src/Warning/DeprecatedComment.php
new file mode 100644
index 000000000..ad43bd7c9
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/DeprecatedComment.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class DeprecatedComment extends Warning
+{
+    const CODE = 37;
+
+    public function __construct()
+    {
+        $this->message = 'Deprecated comments';
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/DomainLiteral.php b/lib/egulias/email-validator/src/Warning/DomainLiteral.php
new file mode 100644
index 000000000..6f36b5e29
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/DomainLiteral.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class DomainLiteral extends Warning
+{
+    const CODE = 70;
+
+    public function __construct()
+    {
+        $this->message = 'Domain Literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/DomainTooLong.php b/lib/egulias/email-validator/src/Warning/DomainTooLong.php
new file mode 100644
index 000000000..61ff17a76
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/DomainTooLong.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class DomainTooLong extends Warning
+{
+    const CODE = 255;
+
+    public function __construct()
+    {
+        $this->message = 'Domain is too long, exceeds 255 chars';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/EmailTooLong.php b/lib/egulias/email-validator/src/Warning/EmailTooLong.php
new file mode 100644
index 000000000..497309dbb
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/EmailTooLong.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+use Egulias\EmailValidator\EmailParser;
+
+class EmailTooLong extends Warning
+{
+    const CODE = 66;
+
+    public function __construct()
+    {
+        $this->message = 'Email is too long, exceeds ' . EmailParser::EMAIL_MAX_LENGTH;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6BadChar.php b/lib/egulias/email-validator/src/Warning/IPV6BadChar.php
new file mode 100644
index 000000000..ba2fcc01b
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6BadChar.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6BadChar extends Warning
+{
+    const CODE = 74;
+
+    public function __construct()
+    {
+        $this->message = 'Bad char in IPV6 domain literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php b/lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php
new file mode 100644
index 000000000..41afa78c6
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6ColonEnd extends Warning
+{
+    const CODE = 77;
+
+    public function __construct()
+    {
+        $this->message = ':: found at the end of the domain literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6ColonStart.php b/lib/egulias/email-validator/src/Warning/IPV6ColonStart.php
new file mode 100644
index 000000000..1bf754e30
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6ColonStart.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6ColonStart extends Warning
+{
+    const CODE = 76;
+
+    public function __construct()
+    {
+        $this->message = ':: found at the start of the domain literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6Deprecated.php b/lib/egulias/email-validator/src/Warning/IPV6Deprecated.php
new file mode 100644
index 000000000..d752caaa1
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6Deprecated.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6Deprecated extends Warning
+{
+    const CODE = 13;
+
+    public function __construct()
+    {
+        $this->message = 'Deprecated form of IPV6';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php b/lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php
new file mode 100644
index 000000000..4f8239499
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6DoubleColon extends Warning
+{
+    const CODE = 73;
+
+    public function __construct()
+    {
+        $this->message = 'Double colon found after IPV6 tag';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6GroupCount.php b/lib/egulias/email-validator/src/Warning/IPV6GroupCount.php
new file mode 100644
index 000000000..a59d317f2
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6GroupCount.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6GroupCount extends Warning
+{
+    const CODE = 72;
+
+    public function __construct()
+    {
+        $this->message = 'Group count is not IPV6 valid';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php b/lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php
new file mode 100644
index 000000000..936274c13
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6MaxGroups extends Warning
+{
+    const CODE = 75;
+
+    public function __construct()
+    {
+        $this->message = 'Reached the maximum number of IPV6 groups allowed';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/LabelTooLong.php b/lib/egulias/email-validator/src/Warning/LabelTooLong.php
new file mode 100644
index 000000000..daf07f408
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/LabelTooLong.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class LabelTooLong extends Warning
+{
+    const CODE = 63;
+
+    public function __construct()
+    {
+        $this->message = 'Label too long';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/LocalTooLong.php b/lib/egulias/email-validator/src/Warning/LocalTooLong.php
new file mode 100644
index 000000000..0d08d8b35
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/LocalTooLong.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class LocalTooLong extends Warning
+{
+    const CODE = 64;
+    const LOCAL_PART_LENGTH = 64;
+
+    public function __construct()
+    {
+        $this->message = 'Local part is too long, exceeds 64 chars (octets)';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php b/lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php
new file mode 100644
index 000000000..b3c21a1f3
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class NoDNSMXRecord extends Warning
+{
+    const CODE = 6;
+
+    public function __construct()
+    {
+        $this->message = 'No MX DSN record was found for this email';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php b/lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
new file mode 100644
index 000000000..10f19e334
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class ObsoleteDTEXT extends Warning
+{
+    const CODE = 71;
+
+    public function __construct()
+    {
+        $this->rfcNumber = 5322;
+        $this->message = 'Obsolete DTEXT in domain literal';
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/QuotedPart.php b/lib/egulias/email-validator/src/Warning/QuotedPart.php
new file mode 100644
index 000000000..36a4265a5
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/QuotedPart.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class QuotedPart extends Warning
+{
+    const CODE = 36;
+
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
+    public function __construct($prevToken, $postToken)
+    {
+        $this->message = "Deprecated Quoted String found between $prevToken and $postToken";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/QuotedString.php b/lib/egulias/email-validator/src/Warning/QuotedString.php
new file mode 100644
index 000000000..817e4e84b
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/QuotedString.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class QuotedString extends Warning
+{
+    const CODE = 11;
+
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
+    public function __construct($prevToken, $postToken)
+    {
+        $this->message = "Quoted String found between $prevToken and $postToken";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/TLD.php b/lib/egulias/email-validator/src/Warning/TLD.php
new file mode 100644
index 000000000..2338b9f44
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/TLD.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class TLD extends Warning
+{
+    const CODE = 9;
+
+    public function __construct()
+    {
+        $this->message = "RFC5321, TLD";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/Warning.php b/lib/egulias/email-validator/src/Warning/Warning.php
new file mode 100644
index 000000000..a2ee7b0de
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/Warning.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+abstract class Warning
+{
+    const CODE = 0;
+
+    /**
+     * @var string
+     */
+    protected $message = '';
+
+    /**
+     * @var int
+     */
+    protected $rfcNumber = 0;
+
+    /**
+     * @return string
+     */
+    public function message()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return int
+     */
+    public function code()
+    {
+        return static::CODE;
+    }
+
+    /**
+     * @return int
+     */
+    public function RFCNumber()
+    {
+        return $this->rfcNumber;
+    }
+
+    public function __toString()
+    {
+        return $this->message() . " rfc: " .  $this->rfcNumber . "interal code: " . static::CODE;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/.gitattributes b/lib/swiftmailer/swiftmailer/.gitattributes
index 33b8efdb8..dc96281b6 100644
--- a/lib/swiftmailer/swiftmailer/.gitattributes
+++ b/lib/swiftmailer/swiftmailer/.gitattributes
@@ -5,5 +5,7 @@
 *.priv -crlf
 *.txt -crlf
 
-# ignore /notes in the git-generated distributed .zip archive
-/notes export-ignore
+# ignore directories in the git-generated distributed .zip archive
+/doc/notes export-ignore
+/tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/lib/swiftmailer/swiftmailer/.gitignore b/lib/swiftmailer/swiftmailer/.gitignore
index 20d389a1c..a911ddf65 100644
--- a/lib/swiftmailer/swiftmailer/.gitignore
+++ b/lib/swiftmailer/swiftmailer/.gitignore
@@ -1,5 +1,6 @@
 /.php_cs.cache
 /.phpunit
+/.phpunit.result.cache
 /build/*
 /composer.lock
 /phpunit.xml
diff --git a/lib/swiftmailer/swiftmailer/.php_cs.dist b/lib/swiftmailer/swiftmailer/.php_cs.dist
index f18d65d42..563b48b90 100644
--- a/lib/swiftmailer/swiftmailer/.php_cs.dist
+++ b/lib/swiftmailer/swiftmailer/.php_cs.dist
@@ -1,15 +1,21 @@
 <?php
 
 return PhpCsFixer\Config::create()
-    ->setRules(array(
+    ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => array('syntax' => 'long'),
+        '@PHPUnit75Migration:risky' => true,
+        'php_unit_dedicate_assert' => ['target' => '5.6'],
+        'array_syntax' => ['syntax' => 'short'],
+        'php_unit_fqcn_annotation' => true,
         'no_unreachable_default_argument_value' => false,
-        'braces' => array('allow_single_line_closure' => true),
+        'braces' => ['allow_single_line_closure' => true],
         'heredoc_to_nowdoc' => false,
-        'phpdoc_annotation_without_dot' => false,
-    ))
+        'ordered_imports' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
+        'fopen_flags' => false,
+    ])
     ->setRiskyAllowed(true)
     ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
 ;
diff --git a/lib/swiftmailer/swiftmailer/.travis.yml b/lib/swiftmailer/swiftmailer/.travis.yml
deleted file mode 100644
index fc24d05e8..000000000
--- a/lib/swiftmailer/swiftmailer/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: php
-
-sudo: false
-
-before_script:
-    - cp tests/acceptance.conf.php.default tests/acceptance.conf.php
-    - cp tests/smoke.conf.php.default tests/smoke.conf.php
-    - composer self-update
-    - composer update --no-interaction --prefer-source
-    - gem install mime-types -v 2.99.1
-    - gem install mailcatcher
-    - mailcatcher --smtp-port 4456
-
-script: ./vendor/bin/simple-phpunit
-
-matrix:
-    include:
-        - php: 5.3
-        - php: 5.4
-        - php: 5.5
-        - php: 5.6
-        - php: 7.0
-        - php: 7.1
-        - php: hhvm
-    allow_failures:
-        - php: hhvm
-    fast_finish: true
-
-cache:
-    directories:
-        - .phpunit
diff --git a/lib/swiftmailer/swiftmailer/CHANGES b/lib/swiftmailer/swiftmailer/CHANGES
index 3532ec2dc..a7ffa0025 100644
--- a/lib/swiftmailer/swiftmailer/CHANGES
+++ b/lib/swiftmailer/swiftmailer/CHANGES
@@ -1,21 +1,125 @@
 Changelog
 =========
 
-5.4.12 (2018-07-31)
--------------------
+**Swiftmailer will stop being maintained at the end of November 2021.**
 
- * fixed typo
+Please, move to Symfony Mailer at your earliest convenience.
+Symfony Mailer is the next evolution of Swiftmailer.
+It provides the same features with support for modern PHP code and support for third-party providers.
+See https://symfony.com/doc/current/mailer.html for more information.
 
-5.4.11 (2018-07-31)
--------------------
+6.3.0 (2021-10-18)
+------------------
 
- * fixed startTLS support for PHP 5.6-
+ * Fix support for PHP 8.1
 
-5.4.10 (2018-07-27)
--------------------
+6.2.7 (2021-03-09)
+------------------
 
+ * Allow egulias/email-validator 3.1+
+
+6.2.6 (2021-03-05)
+------------------
+
+ * Fix Bcc support
+
+6.2.5 (2021-01-12)
+------------------
+
+ * Don't trust properties at destruct time
+ * Remove invalid PHPDocs param in EventDispatcher interface
+ * Bump license year
+ * Removes PHP version from README
+
+6.2.4 (2020-12-08)
+------------------
+
+ * Prevent flushing of the bubble queue when event handler raises another event
+ * Add support for PHP 8
+ * Code cleanups
+
+6.2.3 (2019-11-12)
+------------------
+
+ * no changes
+
+6.2.2 (2019-11-12)
+------------------
+
+ * fixed compat with PHP 7.4
+ * fixed error message when connecting to a stream raises an error before connect()
+
+6.2.1 (2019-04-21)
+------------------
+
+ * reverted "deprecated Swift_CharacterStream_ArrayCharacterStream and Swift_CharacterStream_NgCharacterStream in favor of Swift_CharacterStream_CharacterStream"
+
+6.2.0 (2019-03-10)
+------------------
+
+ * added support for symfony/polyfill-intl-dn
+ * deprecated Swift_CharacterStream_ArrayCharacterStream and Swift_CharacterStream_NgCharacterStream in favor of Swift_CharacterStream_CharacterStream
+
+6.1.3 (2018-09-11)
+------------------
+
+ * added auto-start to the SMTP transport when sending a message
+ * tweaked error message when the response from an SMTP server is empty
+ * fixed missing property in Swift_Mime_IdGenerator
+ * exposed original body content type with Swift_Mime_SimpleMimeEntity::getBodyContentType()
+ * fixed typo in variable name in Swift_AddressEncoder_IdnAddressEncoder
+ * fixed return type in MessageLogger
+ * fixed missing property addressEncoder in SimpleHeaderFactory class
+
+6.1.2 (2018-07-13)
+------------------
+
+ * handled recipient errors when pipelining
+
+6.1.1 (2018-07-04)
+------------------
+
+ * removed hard dependency on an IDN encoder
+
+6.1.0 (2018-07-02)
+------------------
+
+ * added address encoder exceptions during send
+ * added support for bubbling up authenticator error messages
+ * added support for non-ASCII email addresses
+ * introduced new dependencies: transport.smtphandlers and transport.authhandlers
+ * deprecated Swift_Signers_OpenDKIMSigner; use Swift_Signers_DKIMSigner instead
+ * added support for SMTP pipelining
+ * added Swift_Transport_Esmtp_EightBitMimeHandler
  * fixed startTLS only allowed tls1.0, now allowed: tls1.0, tls1.1, tls1.2
 
+6.0.2 (2017-09-30)
+------------------
+
+ * fixed DecoratorPlugin
+ * removed usage of getmypid()
+
+6.0.1 (2017-05-20)
+------------------
+
+ * fixed BC break that can be avoided easily
+
+6.0.0 (2017-05-19)
+------------------
+
+ * added Swift_Transport::ping()
+ * removed Swift_Mime_HeaderFactory, Swift_Mime_HeaderSet, Swift_Mime_Message, Swift_Mime_MimeEntity,
+   and Swift_Mime_ParameterizedHeader interfaces
+ * removed Swift_MailTransport and Swift_Transport_MailTransport
+ * removed Swift_Encoding
+ * removed the Swift_Transport_MailInvoker interface and Swift_Transport_SimpleMailInvoker class
+ * removed the Swift_SignedMessage class
+ * removed newInstance() methods everywhere
+ * methods operating on Date header now use DateTimeImmutable object instead of Unix timestamp;
+   Swift_Mime_Headers_DateHeader::getTimestamp()/setTimestamp() renamed to getDateTime()/setDateTime()
+ * bumped minimum version to PHP 7.0
+ * removed Swift_Validate and replaced by egulias/email-validator
+
 5.4.9 (2018-01-23)
 ------------------
 
diff --git a/lib/swiftmailer/swiftmailer/LICENSE b/lib/swiftmailer/swiftmailer/LICENSE
index 485f1d6d6..ab720772e 100644
--- a/lib/swiftmailer/swiftmailer/LICENSE
+++ b/lib/swiftmailer/swiftmailer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Fabien Potencier
+Copyright (c) 2013-2021 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/swiftmailer/swiftmailer/README b/lib/swiftmailer/swiftmailer/README
deleted file mode 100644
index 52c075758..000000000
--- a/lib/swiftmailer/swiftmailer/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Swift Mailer
-------------
-
-Swift Mailer is a component based mailing solution for PHP 5.
-It is released under the MIT license.
-
-Homepage:      https://swiftmailer.symfony.com/
-Documentation: https://swiftmailer.symfony.com/docs/introduction.html
-Bugs:          https://github.com/swiftmailer/swiftmailer/issues
-Repository:    https://github.com/swiftmailer/swiftmailer
-
-Swift Mailer is highly object-oriented by design and lends itself
-to use in complex web application with a great deal of flexibility.
-
-For full details on usage, see the documentation.
diff --git a/lib/swiftmailer/swiftmailer/README.md b/lib/swiftmailer/swiftmailer/README.md
new file mode 100644
index 000000000..788d7223b
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/README.md
@@ -0,0 +1,25 @@
+Swift Mailer
+------------
+
+**Swiftmailer will stop being maintained at the end of November 2021.**
+
+Please, move to [Symfony Mailer](https://symfony.com/doc/current/mailer.html) at your earliest convenience.
+[Symfony Mailer](https://symfony.com/doc/current/mailer.html) is the next evolution of Swiftmailer.
+It provides the same features with support for modern PHP code and support for third-party providers.
+
+Swift Mailer is a component based mailing solution for PHP.
+It is released under the MIT license.
+
+Swift Mailer is highly object-oriented by design and lends itself
+to use in complex web application with a great deal of flexibility.
+
+For full details on usage, read the [documentation](https://swiftmailer.symfony.com/docs/introduction.html).
+
+Sponsors
+--------
+
+<div>
+    <a href="https://blackfire.io/docs/introduction?utm_source=swiftmailer&utm_medium=github_readme&utm_campaign=logo">
+        <img src="https://static.blackfire.io/assets/intemporals/logo/png/blackfire-io_secondary_horizontal_transparent.png?1" width="255px" alt="Blackfire.io">
+    </a>
+</div>
diff --git a/lib/swiftmailer/swiftmailer/VERSION b/lib/swiftmailer/swiftmailer/VERSION
deleted file mode 100644
index 82a2d1d04..000000000
--- a/lib/swiftmailer/swiftmailer/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-Swift-5.4.12
diff --git a/lib/swiftmailer/swiftmailer/composer.json b/lib/swiftmailer/swiftmailer/composer.json
index 44a1050fa..546b3a1e7 100644
--- a/lib/swiftmailer/swiftmailer/composer.json
+++ b/lib/swiftmailer/swiftmailer/composer.json
@@ -15,23 +15,30 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=7.0.0",
+        "egulias/email-validator": "^2.0|^3.1",
+        "symfony/polyfill-iconv": "^1.0",
+        "symfony/polyfill-mbstring": "^1.0",
+        "symfony/polyfill-intl-idn": "^1.10"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9.1",
-        "symfony/phpunit-bridge": "~3.2"
+        "mockery/mockery": "^1.0",
+        "symfony/phpunit-bridge": "^4.4|^5.4"
+    },
+    "suggest": {
+        "ext-intl": "Needed to support internationalized email addresses"
     },
     "autoload": {
         "files": ["lib/swift_required.php"]
     },
     "autoload-dev": {
-        "psr-0": {
-            "Swift_": "tests/unit"
-        }
+        "psr-0": { "Swift_": "tests/unit" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.4-dev"
+            "dev-master": "6.2-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift.php
index 82c381b73..51b19c9cb 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift.php
@@ -11,16 +11,14 @@
 /**
  * General utility class in Swift Mailer, not to be instantiated.
  *
- *
  * @author Chris Corbyn
  */
 abstract class Swift
 {
-    /** Swift Mailer Version number generated during dist release process */
-    const VERSION = '@SWIFT_VERSION_NUMBER@';
+    const VERSION = '6.3.0';
 
     public static $initialized = false;
-    public static $inits = array();
+    public static $inits = [];
 
     /**
      * Registers an initializer callable that will be called the first time
@@ -58,7 +56,7 @@ abstract class Swift
         if (self::$inits && !self::$initialized) {
             self::$initialized = true;
             foreach (self::$inits as $init) {
-                call_user_func($init);
+                \call_user_func($init);
             }
         }
     }
@@ -75,6 +73,6 @@ abstract class Swift
         if (null !== $callable) {
             self::$inits[] = $callable;
         }
-        spl_autoload_register(array('Swift', 'autoload'));
+        spl_autoload_register(['Swift', 'autoload']);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
new file mode 100644
index 000000000..a1704ffb4
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Email address encoder.
+ *
+ * @author Christian Schmidt
+ */
+interface Swift_AddressEncoder
+{
+    /**
+     * Encodes an email address.
+     *
+     * @throws Swift_AddressEncoderException if the email cannot be represented in
+     *                                       the encoding implemented by this class
+     */
+    public function encodeString(string $address): string;
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
new file mode 100644
index 000000000..a373ef9d5
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An IDN email address encoder.
+ *
+ * Encodes the domain part of an address using IDN. This is compatible will all
+ * SMTP servers.
+ *
+ * This encoder does not support email addresses with non-ASCII characters in
+ * local-part (the substring before @). To send to such addresses, use
+ * Swift_AddressEncoder_Utf8AddressEncoder together with
+ * Swift_Transport_Esmtp_SmtpUtf8Handler. Your outbound SMTP server must support
+ * the SMTPUTF8 extension.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_IdnAddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Encodes the domain part of an address using IDN.
+     *
+     * @throws Swift_AddressEncoderException If local-part contains non-ASCII characters
+     */
+    public function encodeString(string $address): string
+    {
+        $i = strrpos($address, '@');
+        if (false !== $i) {
+            $local = substr($address, 0, $i);
+            $domain = substr($address, $i + 1);
+
+            if (preg_match('/[^\x00-\x7F]/', $local)) {
+                throw new Swift_AddressEncoderException('Non-ASCII characters not supported in local-part', $address);
+            }
+
+            if (preg_match('/[^\x00-\x7F]/', $domain)) {
+                $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46));
+            }
+        }
+
+        return $address;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
new file mode 100644
index 000000000..1b4543056
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A UTF-8 email address encoder.
+ *
+ * Returns the email address verbatimly in UTF-8 as permitted by RFC 6531 and
+ * RFC 6532. It supports addresses containing non-ASCII characters in both
+ * local-part and domain (i.e. on both sides of @).
+ *
+ * This encoder must be used together with Swift_Transport_Esmtp_SmtpUtf8Handler
+ * and requires that the outbound SMTP server supports the SMTPUTF8 extension.
+ *
+ * If your outbound SMTP server does not support SMTPUTF8, use
+ * Swift_AddressEncoder_IdnAddressEncoder instead. This allows sending to email
+ * addresses with non-ASCII characters in the domain, but not in local-part.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_Utf8AddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Returns the address verbatimly.
+     */
+    public function encodeString(string $address): string
+    {
+        return $address;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
new file mode 100644
index 000000000..9b405476b
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * AddressEncoderException when the specified email address is in a format that
+ * cannot be encoded by a given address encoder.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoderException extends Swift_RfcComplianceException
+{
+    protected $address;
+
+    public function __construct(string $message, string $address)
+    {
+        parent::__construct($message);
+
+        $this->address = $address;
+    }
+
+    public function getAddress(): string
+    {
+        return $this->address;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
index a95bccfdf..7a1420f79 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * Attachment class for attaching files to a {@link Swift_Mime_Message}.
+ * Attachment class for attaching files to a {@link Swift_Mime_SimpleMessage}.
  *
  * @author Chris Corbyn
  */
@@ -26,31 +26,14 @@ class Swift_Attachment extends Swift_Mime_Attachment
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_Attachment::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_Attachment::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.attachment')
             );
 
-        $this->setBody($data);
+        $this->setBody($data, $contentType);
         $this->setFilename($filename);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
-    }
-
-    /**
-     * Create a new Attachment.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     *
-     * @return Swift_Mime_Attachment
-     */
-    public static function newInstance($data = null, $filename = null, $contentType = null)
-    {
-        return new self($data, $filename, $contentType);
     }
 
     /**
@@ -59,13 +42,13 @@ class Swift_Attachment extends Swift_Mime_Attachment
      * @param string $path
      * @param string $contentType optional
      *
-     * @return Swift_Mime_Attachment
+     * @return self
      */
     public static function fromPath($path, $contentType = null)
     {
-        return self::newInstance()->setFile(
+        return (new self())->setFile(
             new Swift_ByteStream_FileByteStream($path),
             $contentType
-            );
+        );
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
index a7b0e3a62..3a69c15f1 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -18,48 +18,47 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     /**
      * Write sequence.
      */
-    protected $_sequence = 0;
+    protected $sequence = 0;
 
     /**
      * StreamFilters.
      *
      * @var Swift_StreamFilter[]
      */
-    private $_filters = array();
+    private $filters = [];
 
     /**
      * A buffer for writing.
      */
-    private $_writeBuffer = '';
+    private $writeBuffer = '';
 
     /**
      * Bound streams.
      *
      * @var Swift_InputByteStream[]
      */
-    private $_mirrors = array();
+    private $mirrors = [];
 
     /**
      * Commit the given bytes to the storage medium immediately.
      *
      * @param string $bytes
      */
-    abstract protected function _commit($bytes);
+    abstract protected function doCommit($bytes);
 
     /**
      * Flush any buffers/content with immediate effect.
      */
-    abstract protected function _flush();
+    abstract protected function flush();
 
     /**
      * Add a StreamFilter to this InputByteStream.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key)
     {
-        $this->_filters[$key] = $filter;
+        $this->filters[$key] = $filter;
     }
 
     /**
@@ -69,7 +68,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function removeFilter($key)
     {
-        unset($this->_filters[$key]);
+        unset($this->filters[$key]);
     }
 
     /**
@@ -83,15 +82,15 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function write($bytes)
     {
-        $this->_writeBuffer .= $bytes;
-        foreach ($this->_filters as $filter) {
-            if ($filter->shouldBuffer($this->_writeBuffer)) {
+        $this->writeBuffer .= $bytes;
+        foreach ($this->filters as $filter) {
+            if ($filter->shouldBuffer($this->writeBuffer)) {
                 return;
             }
         }
-        $this->_doWrite($this->_writeBuffer);
+        $this->doWrite($this->writeBuffer);
 
-        return ++$this->_sequence;
+        return ++$this->sequence;
     }
 
     /**
@@ -102,7 +101,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function commit()
     {
-        $this->_doWrite($this->_writeBuffer);
+        $this->doWrite($this->writeBuffer);
     }
 
     /**
@@ -110,12 +109,10 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
-        $this->_mirrors[] = $is;
+        $this->mirrors[] = $is;
     }
 
     /**
@@ -124,17 +121,15 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
-        foreach ($this->_mirrors as $k => $stream) {
+        foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                if ($this->_writeBuffer !== '') {
-                    $stream->write($this->_writeBuffer);
+                if ('' !== $this->writeBuffer) {
+                    $stream->write($this->writeBuffer);
                 }
-                unset($this->_mirrors[$k]);
+                unset($this->mirrors[$k]);
             }
         }
     }
@@ -147,20 +142,20 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function flushBuffers()
     {
-        if ($this->_writeBuffer !== '') {
-            $this->_doWrite($this->_writeBuffer);
+        if ('' !== $this->writeBuffer) {
+            $this->doWrite($this->writeBuffer);
         }
-        $this->_flush();
+        $this->flush();
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->flushBuffers();
         }
     }
 
     /** Run $bytes through all filters */
-    private function _filter($bytes)
+    private function filter($bytes)
     {
-        foreach ($this->_filters as $filter) {
+        foreach ($this->filters as $filter) {
             $bytes = $filter->filter($bytes);
         }
 
@@ -168,14 +163,14 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     }
 
     /** Just write the bytes to the stream */
-    private function _doWrite($bytes)
+    private function doWrite($bytes)
     {
-        $this->_commit($this->_filter($bytes));
+        $this->doCommit($this->filter($bytes));
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
 
-        $this->_writeBuffer = '';
+        $this->writeBuffer = '';
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
index ef05a6d5e..4f3dcc377 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -11,7 +11,7 @@
 /**
  * Allows reading and writing of bytes to and from an array.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_OutputByteStream
 {
@@ -20,28 +20,28 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var string[]
      */
-    private $_array = array();
+    private $array = [];
 
     /**
      * The size of the stack.
      *
      * @var int
      */
-    private $_arraySize = 0;
+    private $arraySize = 0;
 
     /**
      * The internal pointer offset.
      *
      * @var int
      */
-    private $_offset = 0;
+    private $offset = 0;
 
     /**
      * Bound streams.
      *
      * @var Swift_InputByteStream[]
      */
-    private $_mirrors = array();
+    private $mirrors = [];
 
     /**
      * Create a new ArrayByteStream.
@@ -52,13 +52,13 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function __construct($stack = null)
     {
-        if (is_array($stack)) {
-            $this->_array = $stack;
-            $this->_arraySize = count($stack);
-        } elseif (is_string($stack)) {
+        if (\is_array($stack)) {
+            $this->array = $stack;
+            $this->arraySize = \count($stack);
+        } elseif (\is_string($stack)) {
             $this->write($stack);
         } else {
-            $this->_array = array();
+            $this->array = [];
         }
     }
 
@@ -76,16 +76,16 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function read($length)
     {
-        if ($this->_offset == $this->_arraySize) {
+        if ($this->offset == $this->arraySize) {
             return false;
         }
 
         // Don't use array slice
-        $end = $length + $this->_offset;
-        $end = $this->_arraySize < $end ? $this->_arraySize : $end;
+        $end = $length + $this->offset;
+        $end = $this->arraySize < $end ? $this->arraySize : $end;
         $ret = '';
-        for (; $this->_offset < $end; ++$this->_offset) {
-            $ret .= $this->_array[$this->_offset];
+        for (; $this->offset < $end; ++$this->offset) {
+            $ret .= $this->array[$this->offset];
         }
 
         return $ret;
@@ -100,11 +100,11 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
     {
         $to_add = str_split($bytes);
         foreach ($to_add as $value) {
-            $this->_array[] = $value;
+            $this->array[] = $value;
         }
-        $this->_arraySize = count($this->_array);
+        $this->arraySize = \count($this->array);
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
     }
@@ -121,12 +121,10 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
-        $this->_mirrors[] = $is;
+        $this->mirrors[] = $is;
     }
 
     /**
@@ -135,14 +133,12 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
-        foreach ($this->_mirrors as $k => $stream) {
+        foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                unset($this->_mirrors[$k]);
+                unset($this->mirrors[$k]);
             }
         }
     }
@@ -156,13 +152,13 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function setReadPointer($byteOffset)
     {
-        if ($byteOffset > $this->_arraySize) {
-            $byteOffset = $this->_arraySize;
+        if ($byteOffset > $this->arraySize) {
+            $byteOffset = $this->arraySize;
         } elseif ($byteOffset < 0) {
             $byteOffset = 0;
         }
 
-        $this->_offset = $byteOffset;
+        $this->offset = $byteOffset;
     }
 
     /**
@@ -171,11 +167,11 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function flushBuffers()
     {
-        $this->_offset = 0;
-        $this->_array = array();
-        $this->_arraySize = 0;
+        $this->offset = 0;
+        $this->array = [];
+        $this->arraySize = 0;
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->flushBuffers();
         }
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
index 9ed852310..f6391219e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -11,30 +11,27 @@
 /**
  * Allows reading and writing of bytes to and from a file.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_FileStream
 {
     /** The internal pointer offset */
-    private $_offset = 0;
+    private $offset = 0;
 
     /** The path to the file */
-    private $_path;
+    private $path;
 
     /** The mode this file is opened in for writing */
-    private $_mode;
+    private $mode;
 
     /** A lazy-loaded resource handle for reading the file */
-    private $_reader;
+    private $reader;
 
     /** A lazy-loaded resource handle for writing the file */
-    private $_writer;
-
-    /** If magic_quotes_runtime is on, this will be true */
-    private $_quotes = false;
+    private $writer;
 
     /** If stream is seekable true/false, or null if not known */
-    private $_seekable = null;
+    private $seekable = null;
 
     /**
      * Create a new FileByteStream for $path.
@@ -47,12 +44,8 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
         if (empty($path)) {
             throw new Swift_IoException('The path cannot be empty');
         }
-        $this->_path = $path;
-        $this->_mode = $writable ? 'w+b' : 'rb';
-
-        if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
-            $this->_quotes = true;
-        }
+        $this->path = $path;
+        $this->mode = $writable ? 'w+b' : 'rb';
     }
 
     /**
@@ -62,7 +55,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      */
     public function getPath()
     {
-        return $this->_path;
+        return $this->path;
     }
 
     /**
@@ -75,27 +68,21 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      *
      * @param int $length
      *
-     * @throws Swift_IoException
-     *
      * @return string|bool
+     *
+     * @throws Swift_IoException
      */
     public function read($length)
     {
-        $fp = $this->_getReadHandle();
+        $fp = $this->getReadHandle();
         if (!feof($fp)) {
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 0);
-            }
             $bytes = fread($fp, $length);
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 1);
-            }
-            $this->_offset = ftell($fp);
+            $this->offset = ftell($fp);
 
             // If we read one byte after reaching the end of the file
             // feof() will return false and an empty string is returned
-            if ($bytes === '' && feof($fp)) {
-                $this->_resetReadHandle();
+            if ((false === $bytes || '' === $bytes) && feof($fp)) {
+                $this->resetReadHandle();
 
                 return false;
             }
@@ -103,7 +90,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
             return $bytes;
         }
 
-        $this->_resetReadHandle();
+        $this->resetReadHandle();
 
         return false;
     }
@@ -117,108 +104,104 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      */
     public function setReadPointer($byteOffset)
     {
-        if (isset($this->_reader)) {
-            $this->_seekReadStreamToPosition($byteOffset);
+        if (isset($this->reader)) {
+            $this->seekReadStreamToPosition($byteOffset);
         }
-        $this->_offset = $byteOffset;
+        $this->offset = $byteOffset;
     }
 
     /** Just write the bytes to the file */
-    protected function _commit($bytes)
+    protected function doCommit($bytes)
     {
-        fwrite($this->_getWriteHandle(), $bytes);
-        $this->_resetReadHandle();
+        fwrite($this->getWriteHandle(), $bytes);
+        $this->resetReadHandle();
     }
 
     /** Not used */
-    protected function _flush()
+    protected function flush()
     {
     }
 
     /** Get the resource for reading */
-    private function _getReadHandle()
+    private function getReadHandle()
     {
-        if (!isset($this->_reader)) {
-            $pointer = @fopen($this->_path, 'rb');
+        if (!isset($this->reader)) {
+            $pointer = @fopen($this->path, 'rb');
             if (!$pointer) {
-                throw new Swift_IoException(
-                    'Unable to open file for reading ['.$this->_path.']'
-                );
+                throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
             }
-            $this->_reader = $pointer;
-            if ($this->_offset != 0) {
-                $this->_getReadStreamSeekableStatus();
-                $this->_seekReadStreamToPosition($this->_offset);
+            $this->reader = $pointer;
+            if (0 != $this->offset) {
+                $this->getReadStreamSeekableStatus();
+                $this->seekReadStreamToPosition($this->offset);
             }
         }
 
-        return $this->_reader;
+        return $this->reader;
     }
 
     /** Get the resource for writing */
-    private function _getWriteHandle()
+    private function getWriteHandle()
     {
-        if (!isset($this->_writer)) {
-            if (!$this->_writer = fopen($this->_path, $this->_mode)) {
-                throw new Swift_IoException(
-                    'Unable to open file for writing ['.$this->_path.']'
-                );
+        if (!isset($this->writer)) {
+            if (!$this->writer = fopen($this->path, $this->mode)) {
+                throw new Swift_IoException('Unable to open file for writing ['.$this->path.']');
             }
         }
 
-        return $this->_writer;
+        return $this->writer;
     }
 
     /** Force a reload of the resource for reading */
-    private function _resetReadHandle()
+    private function resetReadHandle()
     {
-        if (isset($this->_reader)) {
-            fclose($this->_reader);
-            $this->_reader = null;
+        if (isset($this->reader)) {
+            fclose($this->reader);
+            $this->reader = null;
         }
     }
 
     /** Check if ReadOnly Stream is seekable */
-    private function _getReadStreamSeekableStatus()
+    private function getReadStreamSeekableStatus()
     {
-        $metas = stream_get_meta_data($this->_reader);
-        $this->_seekable = $metas['seekable'];
+        $metas = stream_get_meta_data($this->reader);
+        $this->seekable = $metas['seekable'];
     }
 
     /** Streams in a readOnly stream ensuring copy if needed */
-    private function _seekReadStreamToPosition($offset)
+    private function seekReadStreamToPosition($offset)
     {
-        if ($this->_seekable === null) {
-            $this->_getReadStreamSeekableStatus();
+        if (null === $this->seekable) {
+            $this->getReadStreamSeekableStatus();
         }
-        if ($this->_seekable === false) {
-            $currentPos = ftell($this->_reader);
+        if (false === $this->seekable) {
+            $currentPos = ftell($this->reader);
             if ($currentPos < $offset) {
                 $toDiscard = $offset - $currentPos;
-                fread($this->_reader, $toDiscard);
+                fread($this->reader, $toDiscard);
 
                 return;
             }
-            $this->_copyReadStream();
+            $this->copyReadStream();
         }
-        fseek($this->_reader, $offset, SEEK_SET);
+        fseek($this->reader, $offset, SEEK_SET);
     }
 
     /** Copy a readOnly Stream to ensure seekability */
-    private function _copyReadStream()
+    private function copyReadStream()
     {
         if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
             /* We have opened a php:// Stream Should work without problem */
-        } elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
+        } elseif (\function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
             /* We have opened a tmpfile */
         } else {
             throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
         }
-        $currentPos = ftell($this->_reader);
-        fclose($this->_reader);
-        $source = fopen($this->_path, 'rb');
+        $currentPos = ftell($this->reader);
+        fclose($this->reader);
+        $source = fopen($this->path, 'rb');
         if (!$source) {
-            throw new Swift_IoException('Unable to open file for copying ['.$this->_path.']');
+            throw new Swift_IoException('Unable to open file for copying ['.$this->path.']');
         }
         fseek($tmpFile, 0, SEEK_SET);
         while (!feof($source)) {
@@ -226,6 +209,6 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
         }
         fseek($tmpFile, $currentPos, SEEK_SET);
         fclose($source);
-        $this->_reader = $tmpFile;
+        $this->reader = $tmpFile;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
index 1c9a80c03..0dc61909d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
@@ -17,7 +17,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
     {
         $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
 
-        if ($filePath === false) {
+        if (false === $filePath) {
             throw new Swift_IoException('Failed to retrieve temporary file name.');
         }
 
@@ -26,7 +26,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
 
     public function getContent()
     {
-        if (($content = file_get_contents($this->getPath())) === false) {
+        if (false === ($content = file_get_contents($this->getPath()))) {
             throw new Swift_IoException('Failed to get temporary file content.');
         }
 
@@ -39,4 +39,14 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
             @unlink($this->getPath());
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
index 6a18e1dd1..3e055afd9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -11,8 +11,8 @@
 /**
  * Provides fixed-width byte sizes for reading fixed-width character sets.
  *
- * @author Chris Corbyn
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Chris Corbyn
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterReader
 {
@@ -21,7 +21,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      *
      * @var int
      */
-    private $_width;
+    private $width;
 
     /**
      * Creates a new GenericFixedWidthReader using $width bytes per character.
@@ -30,7 +30,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function __construct($width)
     {
-        $this->_width = $width;
+        $this->width = $width;
     }
 
     /**
@@ -45,13 +45,13 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         // % and / are CPU intensive, so, maybe find a better way
-        $ignored = $strlen % $this->_width;
+        $ignored = $strlen % $this->width;
         $ignoredChars = $ignored ? substr($string, -$ignored) : '';
-        $currentMap = $this->_width;
+        $currentMap = $this->width;
 
-        return ($strlen - $ignored) / $this->_width;
+        return ($strlen - $ignored) / $this->width;
     }
 
     /**
@@ -80,7 +80,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function validateByteSequence($bytes, $size)
     {
-        $needed = $this->_width - $size;
+        $needed = $this->width - $size;
 
         return $needed > -1 ? $needed : -1;
     }
@@ -92,6 +92,6 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function getInitialByteSize()
     {
-        return $this->_width;
+        return $this->width;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
index 67da48f6c..ffc05f716 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -27,7 +27,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         $ignoredChars = '';
         for ($i = 0; $i < $strlen; ++$i) {
             if ($string[$i] > "\x07F") {
@@ -65,7 +65,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
     public function validateByteSequence($bytes, $size)
     {
         $byte = reset($bytes);
-        if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
+        if (1 == \count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
             return 0;
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 22746bd85..da37e0da9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -17,8 +17,8 @@
 class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
 {
     /** Pre-computed for optimization */
-    private static $length_map = array(
-        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
+    private static $length_map = [
+        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
@@ -34,10 +34,10 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
-        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0,  // 0xFN
-    );
+        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
+    ];
 
-    private static $s_length_map = array(
+    private static $s_length_map = [
         "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
         "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
         "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
@@ -70,7 +70,7 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
         "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
         "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
-     );
+     ];
 
     /**
      * Returns the complete character map.
@@ -85,22 +85,22 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
         if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
-            $currentMap['p'] = $currentMap['i'] = array();
+            $currentMap['p'] = $currentMap['i'] = [];
         }
 
-        $strlen = strlen($string);
-        $charPos = count($currentMap['p']);
+        $strlen = \strlen($string);
+        $charPos = \count($currentMap['p']);
         $foundChars = 0;
         $invalid = false;
         for ($i = 0; $i < $strlen; ++$i) {
             $char = $string[$i];
             $size = self::$s_length_map[$char];
-            if ($size == 0) {
+            if (0 == $size) {
                 /* char is invalid, we must wait for a resync */
                 $invalid = true;
                 continue;
             } else {
-                if ($invalid == true) {
+                if (true === $invalid) {
                     /* We mark the chars as invalid and start a new char */
                     $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
                     $currentMap['i'][$charPos + $foundChars] = true;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
index 9171a0bac..86900894a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -20,14 +20,14 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      *
      * @var array
      */
-    private static $_map = array();
+    private static $map = [];
 
     /**
      * Factories which have already been loaded.
      *
      * @var Swift_CharacterReaderFactory[]
      */
-    private static $_loaded = array();
+    private static $loaded = [];
 
     /**
      * Creates a new CharacterReaderFactory.
@@ -44,54 +44,54 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
 
     public function init()
     {
-        if (count(self::$_map) > 0) {
+        if (\count(self::$map) > 0) {
             return;
         }
 
         $prefix = 'Swift_CharacterReader_';
 
-        $singleByte = array(
+        $singleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(1),
-            );
+            'constructor' => [1],
+            ];
 
-        $doubleByte = array(
+        $doubleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(2),
-            );
+            'constructor' => [2],
+            ];
 
-        $fourBytes = array(
+        $fourBytes = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(4),
-            );
+            'constructor' => [4],
+            ];
 
         // Utf-8
-        self::$_map['utf-?8'] = array(
+        self::$map['utf-?8'] = [
             'class' => $prefix.'Utf8Reader',
-            'constructor' => array(),
-            );
+            'constructor' => [],
+            ];
 
         //7-8 bit charsets
-        self::$_map['(us-)?ascii'] = $singleByte;
-        self::$_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
-        self::$_map['windows-?125[0-9]'] = $singleByte;
-        self::$_map['cp-?[0-9]+'] = $singleByte;
-        self::$_map['ansi'] = $singleByte;
-        self::$_map['macintosh'] = $singleByte;
-        self::$_map['koi-?7'] = $singleByte;
-        self::$_map['koi-?8-?.+'] = $singleByte;
-        self::$_map['mik'] = $singleByte;
-        self::$_map['(cork|t1)'] = $singleByte;
-        self::$_map['v?iscii'] = $singleByte;
+        self::$map['(us-)?ascii'] = $singleByte;
+        self::$map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
+        self::$map['windows-?125[0-9]'] = $singleByte;
+        self::$map['cp-?[0-9]+'] = $singleByte;
+        self::$map['ansi'] = $singleByte;
+        self::$map['macintosh'] = $singleByte;
+        self::$map['koi-?7'] = $singleByte;
+        self::$map['koi-?8-?.+'] = $singleByte;
+        self::$map['mik'] = $singleByte;
+        self::$map['(cork|t1)'] = $singleByte;
+        self::$map['v?iscii'] = $singleByte;
 
         //16 bits
-        self::$_map['(ucs-?2|utf-?16)'] = $doubleByte;
+        self::$map['(ucs-?2|utf-?16)'] = $doubleByte;
 
         //32 bits
-        self::$_map['(ucs-?4|utf-?32)'] = $fourBytes;
+        self::$map['(ucs-?4|utf-?32)'] = $fourBytes;
 
         // Fallback
-        self::$_map['.*'] = $singleByte;
+        self::$map['.*'] = $singleByte;
     }
 
     /**
@@ -103,21 +103,21 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      */
     public function getReaderFor($charset)
     {
-        $charset = trim(strtolower($charset));
-        foreach (self::$_map as $pattern => $spec) {
+        $charset = strtolower(trim($charset ?? ''));
+        foreach (self::$map as $pattern => $spec) {
             $re = '/^'.$pattern.'$/D';
             if (preg_match($re, $charset)) {
-                if (!array_key_exists($pattern, self::$_loaded)) {
+                if (!\array_key_exists($pattern, self::$loaded)) {
                     $reflector = new ReflectionClass($spec['class']);
                     if ($reflector->getConstructor()) {
                         $reader = $reflector->newInstanceArgs($spec['constructor']);
                     } else {
                         $reader = $reflector->newInstance();
                     }
-                    self::$_loaded[$pattern] = $reader;
+                    self::$loaded[$pattern] = $reader;
                 }
 
-                return self::$_loaded[$pattern];
+                return self::$loaded[$pattern];
             }
         }
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
index 717924f5d..c9d8a078e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
@@ -28,8 +28,6 @@ interface Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index 7213a40d7..5c2869455 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -16,28 +16,28 @@
 class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStream
 {
     /** A map of byte values and their respective characters */
-    private static $_charMap;
+    private static $charMap;
 
     /** A map of characters and their derivative byte values */
-    private static $_byteMap;
+    private static $byteMap;
 
     /** The char reader (lazy-loaded) for the current charset */
-    private $_charReader;
+    private $charReader;
 
     /** A factory for creating CharacterReader instances */
-    private $_charReaderFactory;
+    private $charReaderFactory;
 
     /** The character set this stream is using */
-    private $_charset;
+    private $charset;
 
     /** Array of characters */
-    private $_array = array();
+    private $array = [];
 
     /** Size of the array of character */
-    private $_array_size = array();
+    private $array_size = [];
 
     /** The current character offset in the stream */
-    private $_offset = 0;
+    private $offset = 0;
 
     /**
      * Create a new CharacterStream with the given $chars, if set.
@@ -47,7 +47,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
-        self::_initializeMaps();
+        self::initializeMaps();
         $this->setCharacterReaderFactory($factory);
         $this->setCharacterSet($charset);
     }
@@ -59,18 +59,16 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function setCharacterSet($charset)
     {
-        $this->_charset = $charset;
-        $this->_charReader = null;
+        $this->charset = $charset;
+        $this->charReader = null;
     }
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
-        $this->_charReaderFactory = $factory;
+        $this->charReaderFactory = $factory;
     }
 
     /**
@@ -80,28 +78,28 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
-        if (!isset($this->_charReader)) {
-            $this->_charReader = $this->_charReaderFactory
-                ->getReaderFor($this->_charset);
+        if (!isset($this->charReader)) {
+            $this->charReader = $this->charReaderFactory
+                ->getReaderFor($this->charset);
         }
 
-        $startLength = $this->_charReader->getInitialByteSize();
+        $startLength = $this->charReader->getInitialByteSize();
         while (false !== $bytes = $os->read($startLength)) {
-            $c = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
-                $c[] = self::$_byteMap[$bytes[$i]];
+            $c = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
+                $c[] = self::$byteMap[$bytes[$i]];
             }
-            $size = count($c);
-            $need = $this->_charReader
+            $size = \count($c);
+            $need = $this->charReader
                 ->validateByteSequence($c, $size);
             if ($need > 0 &&
                 false !== $bytes = $os->read($need)) {
-                for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
-                    $c[] = self::$_byteMap[$bytes[$i]];
+                for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
+                    $c[] = self::$byteMap[$bytes[$i]];
                 }
             }
-            $this->_array[] = $c;
-            ++$this->_array_size;
+            $this->array[] = $c;
+            ++$this->array_size;
         }
     }
 
@@ -127,20 +125,20 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function read($length)
     {
-        if ($this->_offset == $this->_array_size) {
+        if ($this->offset == $this->array_size) {
             return false;
         }
 
         // Don't use array slice
-        $arrays = array();
-        $end = $length + $this->_offset;
-        for ($i = $this->_offset; $i < $end; ++$i) {
-            if (!isset($this->_array[$i])) {
+        $arrays = [];
+        $end = $length + $this->offset;
+        for ($i = $this->offset; $i < $end; ++$i) {
+            if (!isset($this->array[$i])) {
                 break;
             }
-            $arrays[] = $this->_array[$i];
+            $arrays[] = $this->array[$i];
         }
-        $this->_offset += $i - $this->_offset; // Limit function calls
+        $this->offset += $i - $this->offset; // Limit function calls
         $chars = false;
         foreach ($arrays as $array) {
             $chars .= implode('', array_map('chr', $array));
@@ -159,20 +157,20 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function readBytes($length)
     {
-        if ($this->_offset == $this->_array_size) {
+        if ($this->offset == $this->array_size) {
             return false;
         }
-        $arrays = array();
-        $end = $length + $this->_offset;
-        for ($i = $this->_offset; $i < $end; ++$i) {
-            if (!isset($this->_array[$i])) {
+        $arrays = [];
+        $end = $length + $this->offset;
+        for ($i = $this->offset; $i < $end; ++$i) {
+            if (!isset($this->array[$i])) {
                 break;
             }
-            $arrays[] = $this->_array[$i];
+            $arrays[] = $this->array[$i];
         }
-        $this->_offset += ($i - $this->_offset); // Limit function calls
+        $this->offset += ($i - $this->offset); // Limit function calls
 
-        return call_user_func_array('array_merge', $arrays);
+        return array_merge(...$arrays);
     }
 
     /**
@@ -182,31 +180,31 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function write($chars)
     {
-        if (!isset($this->_charReader)) {
-            $this->_charReader = $this->_charReaderFactory->getReaderFor(
-                $this->_charset);
+        if (!isset($this->charReader)) {
+            $this->charReader = $this->charReaderFactory->getReaderFor(
+                $this->charset);
         }
 
-        $startLength = $this->_charReader->getInitialByteSize();
+        $startLength = $this->charReader->getInitialByteSize();
 
         $fp = fopen('php://memory', 'w+b');
         fwrite($fp, $chars);
         unset($chars);
         fseek($fp, 0, SEEK_SET);
 
-        $buffer = array(0);
+        $buffer = [0];
         $buf_pos = 1;
         $buf_len = 1;
         $has_datas = true;
         do {
-            $bytes = array();
+            $bytes = [];
             // Buffer Filing
             if ($buf_len - $buf_pos < $startLength) {
                 $buf = array_splice($buffer, $buf_pos);
-                $new = $this->_reloadBuffer($fp, 100);
+                $new = $this->reloadBuffer($fp, 100);
                 if ($new) {
                     $buffer = array_merge($buf, $new);
-                    $buf_len = count($buffer);
+                    $buf_len = \count($buffer);
                     $buf_pos = 0;
                 } else {
                     $has_datas = false;
@@ -218,23 +216,23 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
                     ++$size;
                     $bytes[] = $buffer[$buf_pos++];
                 }
-                $need = $this->_charReader->validateByteSequence(
+                $need = $this->charReader->validateByteSequence(
                     $bytes, $size);
                 if ($need > 0) {
                     if ($buf_len - $buf_pos < $need) {
-                        $new = $this->_reloadBuffer($fp, $need);
+                        $new = $this->reloadBuffer($fp, $need);
 
                         if ($new) {
                             $buffer = array_merge($buffer, $new);
-                            $buf_len = count($buffer);
+                            $buf_len = \count($buffer);
                         }
                     }
                     for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i) {
                         $bytes[] = $buffer[$buf_pos++];
                     }
                 }
-                $this->_array[] = $bytes;
-                ++$this->_array_size;
+                $this->array[] = $bytes;
+                ++$this->array_size;
             }
         } while ($has_datas);
 
@@ -248,12 +246,12 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function setPointer($charOffset)
     {
-        if ($charOffset > $this->_array_size) {
-            $charOffset = $this->_array_size;
+        if ($charOffset > $this->array_size) {
+            $charOffset = $this->array_size;
         } elseif ($charOffset < 0) {
             $charOffset = 0;
         }
-        $this->_offset = $charOffset;
+        $this->offset = $charOffset;
     }
 
     /**
@@ -261,17 +259,17 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function flushContents()
     {
-        $this->_offset = 0;
-        $this->_array = array();
-        $this->_array_size = 0;
+        $this->offset = 0;
+        $this->array = [];
+        $this->array_size = 0;
     }
 
-    private function _reloadBuffer($fp, $len)
+    private function reloadBuffer($fp, $len)
     {
-        if (!feof($fp) && ($bytes = fread($fp, $len)) !== false) {
-            $buf = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
-                $buf[] = self::$_byteMap[$bytes[$i]];
+        if (!feof($fp) && false !== ($bytes = fread($fp, $len))) {
+            $buf = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
+                $buf[] = self::$byteMap[$bytes[$i]];
             }
 
             return $buf;
@@ -280,14 +278,14 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         return false;
     }
 
-    private static function _initializeMaps()
+    private static function initializeMaps()
     {
-        if (!isset(self::$_charMap)) {
-            self::$_charMap = array();
+        if (!isset(self::$charMap)) {
+            self::$charMap = [];
             for ($byte = 0; $byte < 256; ++$byte) {
-                self::$_charMap[$byte] = chr($byte);
+                self::$charMap[$byte] = \chr($byte);
             }
-            self::$_byteMap = array_flip(self::$_charMap);
+            self::$byteMap = array_flip(self::$charMap);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
index 58bd140fd..7578dda9c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -11,7 +11,7 @@
 /**
  * A CharacterStream implementation which stores characters in an internal array.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 {
@@ -20,69 +20,68 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      *
      * @var Swift_CharacterReader
      */
-    private $_charReader;
+    private $charReader;
 
     /**
      * A factory for creating CharacterReader instances.
      *
      * @var Swift_CharacterReaderFactory
      */
-    private $_charReaderFactory;
+    private $charReaderFactory;
 
     /**
      * The character set this stream is using.
      *
      * @var string
      */
-    private $_charset;
+    private $charset;
 
     /**
      * The data's stored as-is.
      *
      * @var string
      */
-    private $_datas = '';
+    private $datas = '';
 
     /**
      * Number of bytes in the stream.
      *
      * @var int
      */
-    private $_datasSize = 0;
+    private $datasSize = 0;
 
     /**
      * Map.
      *
      * @var mixed
      */
-    private $_map;
+    private $map;
 
     /**
      * Map Type.
      *
      * @var int
      */
-    private $_mapType = 0;
+    private $mapType = 0;
 
     /**
      * Number of characters in the stream.
      *
      * @var int
      */
-    private $_charCount = 0;
+    private $charCount = 0;
 
     /**
      * Position in the stream.
      *
      * @var int
      */
-    private $_currentPos = 0;
+    private $currentPos = 0;
 
     /**
      * Constructor.
      *
-     * @param Swift_CharacterReaderFactory $factory
-     * @param string                       $charset
+     * @param string $charset
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
@@ -99,19 +98,17 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function setCharacterSet($charset)
     {
-        $this->_charset = $charset;
-        $this->_charReader = null;
-        $this->_mapType = 0;
+        $this->charset = $charset;
+        $this->charReader = null;
+        $this->mapType = 0;
     }
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
-        $this->_charReaderFactory = $factory;
+        $this->charReaderFactory = $factory;
     }
 
     /**
@@ -119,17 +116,15 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function flushContents()
     {
-        $this->_datas = null;
-        $this->_map = null;
-        $this->_charCount = 0;
-        $this->_currentPos = 0;
-        $this->_datasSize = 0;
+        $this->datas = null;
+        $this->map = null;
+        $this->charCount = 0;
+        $this->currentPos = 0;
+        $this->datasSize = 0;
     }
 
     /**
      * @see Swift_CharacterStream::importByteStream()
-     *
-     * @param Swift_OutputByteStream $os
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
@@ -161,49 +156,49 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function read($length)
     {
-        if ($this->_currentPos >= $this->_charCount) {
+        if ($this->currentPos >= $this->charCount) {
             return false;
         }
         $ret = false;
-        $length = $this->_currentPos + $length > $this->_charCount ? $this->_charCount - $this->_currentPos : $length;
-        switch ($this->_mapType) {
+        $length = ($this->currentPos + $length > $this->charCount) ? $this->charCount - $this->currentPos : $length;
+        switch ($this->mapType) {
             case Swift_CharacterReader::MAP_TYPE_FIXED_LEN:
-                $len = $length * $this->_map;
-                $ret = substr($this->_datas,
-                        $this->_currentPos * $this->_map,
+                $len = $length * $this->map;
+                $ret = substr($this->datas,
+                        $this->currentPos * $this->map,
                         $len);
-                $this->_currentPos += $length;
+                $this->currentPos += $length;
                 break;
 
             case Swift_CharacterReader::MAP_TYPE_INVALID:
                 $ret = '';
-                for (; $this->_currentPos < $length; ++$this->_currentPos) {
-                    if (isset($this->_map[$this->_currentPos])) {
+                for (; $this->currentPos < $length; ++$this->currentPos) {
+                    if (isset($this->map[$this->currentPos])) {
                         $ret .= '?';
                     } else {
-                        $ret .= $this->_datas[$this->_currentPos];
+                        $ret .= $this->datas[$this->currentPos];
                     }
                 }
                 break;
 
             case Swift_CharacterReader::MAP_TYPE_POSITIONS:
-                $end = $this->_currentPos + $length;
-                $end = $end > $this->_charCount ? $this->_charCount : $end;
+                $end = $this->currentPos + $length;
+                $end = $end > $this->charCount ? $this->charCount : $end;
                 $ret = '';
                 $start = 0;
-                if ($this->_currentPos > 0) {
-                    $start = $this->_map['p'][$this->_currentPos - 1];
+                if ($this->currentPos > 0) {
+                    $start = $this->map['p'][$this->currentPos - 1];
                 }
                 $to = $start;
-                for (; $this->_currentPos < $end; ++$this->_currentPos) {
-                    if (isset($this->_map['i'][$this->_currentPos])) {
-                        $ret .= substr($this->_datas, $start, $to - $start).'?';
-                        $start = $this->_map['p'][$this->_currentPos];
+                for (; $this->currentPos < $end; ++$this->currentPos) {
+                    if (isset($this->map['i'][$this->currentPos])) {
+                        $ret .= substr($this->datas, $start, $to - $start).'?';
+                        $start = $this->map['p'][$this->currentPos];
                     } else {
-                        $to = $this->_map['p'][$this->_currentPos];
+                        $to = $this->map['p'][$this->currentPos];
                     }
                 }
-                $ret .= substr($this->_datas, $start, $to - $start);
+                $ret .= substr($this->datas, $start, $to - $start);
                 break;
         }
 
@@ -220,7 +215,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     public function readBytes($length)
     {
         $read = $this->read($length);
-        if ($read !== false) {
+        if (false !== $read) {
             $ret = array_map('ord', str_split($read, 1));
 
             return $ret;
@@ -236,10 +231,10 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function setPointer($charOffset)
     {
-        if ($this->_charCount < $charOffset) {
-            $charOffset = $this->_charCount;
+        if ($this->charCount < $charOffset) {
+            $charOffset = $this->charCount;
         }
-        $this->_currentPos = $charOffset;
+        $this->currentPos = $charOffset;
     }
 
     /**
@@ -249,19 +244,19 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function write($chars)
     {
-        if (!isset($this->_charReader)) {
-            $this->_charReader = $this->_charReaderFactory->getReaderFor(
-                $this->_charset);
-            $this->_map = array();
-            $this->_mapType = $this->_charReader->getMapType();
+        if (!isset($this->charReader)) {
+            $this->charReader = $this->charReaderFactory->getReaderFor(
+                $this->charset);
+            $this->map = [];
+            $this->mapType = $this->charReader->getMapType();
         }
         $ignored = '';
-        $this->_datas .= $chars;
-        $this->_charCount += $this->_charReader->getCharPositions(substr($this->_datas, $this->_datasSize), $this->_datasSize, $this->_map, $ignored);
-        if ($ignored !== false) {
-            $this->_datasSize = strlen($this->_datas) - strlen($ignored);
+        $this->datas .= $chars;
+        $this->charCount += $this->charReader->getCharPositions(substr($this->datas, $this->datasSize), $this->datasSize, $this->map, $ignored);
+        if (false !== $ignored) {
+            $this->datasSize = \strlen($this->datas) - \strlen($ignored);
         } else {
-            $this->_datasSize = strlen($this->_datas);
+            $this->datasSize = \strlen($this->datas);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
index 4ae5bacfc..a711bac47 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
@@ -16,10 +16,10 @@
 abstract class Swift_ConfigurableSpool implements Swift_Spool
 {
     /** The maximum number of messages to send per flush */
-    private $_message_limit;
+    private $message_limit;
 
     /** The time limit per flush */
-    private $_time_limit;
+    private $time_limit;
 
     /**
      * Sets the maximum number of messages to send per flush.
@@ -28,7 +28,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function setMessageLimit($limit)
     {
-        $this->_message_limit = (int) $limit;
+        $this->message_limit = (int) $limit;
     }
 
     /**
@@ -38,7 +38,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function getMessageLimit()
     {
-        return $this->_message_limit;
+        return $this->message_limit;
     }
 
     /**
@@ -48,7 +48,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function setTimeLimit($limit)
     {
-        $this->_time_limit = (int) $limit;
+        $this->time_limit = (int) $limit;
     }
 
     /**
@@ -58,6 +58,6 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function getTimeLimit()
     {
-        return $this->_time_limit;
+        return $this->time_limit;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
index befec9ac0..3cc885ec0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -11,30 +11,33 @@
 /**
  * Dependency Injection container.
  *
- * @author Chris Corbyn
+ * @author  Chris Corbyn
  */
 class Swift_DependencyContainer
 {
     /** Constant for literal value types */
-    const TYPE_VALUE = 0x0001;
+    const TYPE_VALUE = 0x00001;
 
     /** Constant for new instance types */
-    const TYPE_INSTANCE = 0x0010;
+    const TYPE_INSTANCE = 0x00010;
 
     /** Constant for shared instance types */
-    const TYPE_SHARED = 0x0100;
+    const TYPE_SHARED = 0x00100;
 
     /** Constant for aliases */
-    const TYPE_ALIAS = 0x1000;
+    const TYPE_ALIAS = 0x01000;
+
+    /** Constant for arrays */
+    const TYPE_ARRAY = 0x10000;
 
     /** Singleton instance */
-    private static $_instance = null;
+    private static $instance = null;
 
     /** The data container */
-    private $_store = array();
+    private $store = [];
 
     /** The current endpoint in the data container */
-    private $_endPoint;
+    private $endPoint;
 
     /**
      * Constructor should not be used.
@@ -52,11 +55,11 @@ class Swift_DependencyContainer
      */
     public static function getInstance()
     {
-        if (!isset(self::$_instance)) {
-            self::$_instance = new self();
+        if (!isset(self::$instance)) {
+            self::$instance = new self();
         }
 
-        return self::$_instance;
+        return self::$instance;
     }
 
     /**
@@ -66,7 +69,7 @@ class Swift_DependencyContainer
      */
     public function listItems()
     {
-        return array_keys($this->_store);
+        return array_keys($this->store);
     }
 
     /**
@@ -80,8 +83,8 @@ class Swift_DependencyContainer
      */
     public function has($itemName)
     {
-        return array_key_exists($itemName, $this->_store)
-            && isset($this->_store[$itemName]['lookupType']);
+        return \array_key_exists($itemName, $this->store)
+            && isset($this->store[$itemName]['lookupType']);
     }
 
     /**
@@ -91,27 +94,27 @@ class Swift_DependencyContainer
      *
      * @param string $itemName
      *
-     * @throws Swift_DependencyException If the dependency is not found
-     *
      * @return mixed
+     *
+     * @throws Swift_DependencyException If the dependency is not found
      */
     public function lookup($itemName)
     {
         if (!$this->has($itemName)) {
-            throw new Swift_DependencyException(
-                'Cannot lookup dependency "'.$itemName.'" since it is not registered.'
-                );
+            throw new Swift_DependencyException('Cannot lookup dependency "'.$itemName.'" since it is not registered.');
         }
 
-        switch ($this->_store[$itemName]['lookupType']) {
+        switch ($this->store[$itemName]['lookupType']) {
             case self::TYPE_ALIAS:
-                return $this->_createAlias($itemName);
+                return $this->createAlias($itemName);
             case self::TYPE_VALUE:
-                return $this->_getValue($itemName);
+                return $this->getValue($itemName);
             case self::TYPE_INSTANCE:
-                return $this->_createNewInstance($itemName);
+                return $this->createNewInstance($itemName);
             case self::TYPE_SHARED:
-                return $this->_createSharedInstance($itemName);
+                return $this->createSharedInstance($itemName);
+            case self::TYPE_ARRAY:
+                return $this->createDependenciesFor($itemName);
         }
     }
 
@@ -124,9 +127,9 @@ class Swift_DependencyContainer
      */
     public function createDependenciesFor($itemName)
     {
-        $args = array();
-        if (isset($this->_store[$itemName]['args'])) {
-            $args = $this->_resolveArgs($this->_store[$itemName]['args']);
+        $args = [];
+        if (isset($this->store[$itemName]['args'])) {
+            $args = $this->resolveArgs($this->store[$itemName]['args']);
         }
 
         return $args;
@@ -147,8 +150,8 @@ class Swift_DependencyContainer
      */
     public function register($itemName)
     {
-        $this->_store[$itemName] = array();
-        $this->_endPoint = &$this->_store[$itemName];
+        $this->store[$itemName] = [];
+        $this->endPoint = &$this->store[$itemName];
 
         return $this;
     }
@@ -164,7 +167,7 @@ class Swift_DependencyContainer
      */
     public function asValue($value)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_VALUE;
         $endPoint['value'] = $value;
 
@@ -180,7 +183,7 @@ class Swift_DependencyContainer
      */
     public function asAliasOf($lookup)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_ALIAS;
         $endPoint['ref'] = $lookup;
 
@@ -202,7 +205,7 @@ class Swift_DependencyContainer
      */
     public function asNewInstanceOf($className)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_INSTANCE;
         $endPoint['className'] = $className;
 
@@ -220,13 +223,28 @@ class Swift_DependencyContainer
      */
     public function asSharedInstanceOf($className)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_SHARED;
         $endPoint['className'] = $className;
 
         return $this;
     }
 
+    /**
+     * Specify the previously registered item as array of dependencies.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @return $this
+     */
+    public function asArray()
+    {
+        $endPoint = &$this->getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_ARRAY;
+
+        return $this;
+    }
+
     /**
      * Specify a list of injected dependencies for the previously registered item.
      *
@@ -234,14 +252,12 @@ class Swift_DependencyContainer
      *
      * @see addConstructorValue(), addConstructorLookup()
      *
-     * @param array $lookups
-     *
      * @return $this
      */
     public function withDependencies(array $lookups)
     {
-        $endPoint = &$this->_getEndPoint();
-        $endPoint['args'] = array();
+        $endPoint = &$this->getEndPoint();
+        $endPoint['args'] = [];
         foreach ($lookups as $lookup) {
             $this->addConstructorLookup($lookup);
         }
@@ -261,11 +277,11 @@ class Swift_DependencyContainer
      */
     public function addConstructorValue($value)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         if (!isset($endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+        $endPoint['args'][] = ['type' => 'value', 'item' => $value];
 
         return $this;
     }
@@ -282,31 +298,31 @@ class Swift_DependencyContainer
      */
     public function addConstructorLookup($lookup)
     {
-        $endPoint = &$this->_getEndPoint();
-        if (!isset($this->_endPoint['args'])) {
-            $endPoint['args'] = array();
+        $endPoint = &$this->getEndPoint();
+        if (!isset($this->endPoint['args'])) {
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+        $endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
 
         return $this;
     }
 
     /** Get the literal value with $itemName */
-    private function _getValue($itemName)
+    private function getValue($itemName)
     {
-        return $this->_store[$itemName]['value'];
+        return $this->store[$itemName]['value'];
     }
 
     /** Resolve an alias to another item */
-    private function _createAlias($itemName)
+    private function createAlias($itemName)
     {
-        return $this->lookup($this->_store[$itemName]['ref']);
+        return $this->lookup($this->store[$itemName]['ref']);
     }
 
     /** Create a fresh instance of $itemName */
-    private function _createNewInstance($itemName)
+    private function createNewInstance($itemName)
     {
-        $reflector = new ReflectionClass($this->_store[$itemName]['className']);
+        $reflector = new ReflectionClass($this->store[$itemName]['className']);
         if ($reflector->getConstructor()) {
             return $reflector->newInstanceArgs(
                 $this->createDependenciesFor($itemName)
@@ -317,35 +333,33 @@ class Swift_DependencyContainer
     }
 
     /** Create and register a shared instance of $itemName */
-    private function _createSharedInstance($itemName)
+    private function createSharedInstance($itemName)
     {
-        if (!isset($this->_store[$itemName]['instance'])) {
-            $this->_store[$itemName]['instance'] = $this->_createNewInstance($itemName);
+        if (!isset($this->store[$itemName]['instance'])) {
+            $this->store[$itemName]['instance'] = $this->createNewInstance($itemName);
         }
 
-        return $this->_store[$itemName]['instance'];
+        return $this->store[$itemName]['instance'];
     }
 
     /** Get the current endpoint in the store */
-    private function &_getEndPoint()
+    private function &getEndPoint()
     {
-        if (!isset($this->_endPoint)) {
-            throw new BadMethodCallException(
-                'Component must first be registered by calling register()'
-                );
+        if (!isset($this->endPoint)) {
+            throw new BadMethodCallException('Component must first be registered by calling register()');
         }
 
-        return $this->_endPoint;
+        return $this->endPoint;
     }
 
     /** Get an argument list with dependencies resolved */
-    private function _resolveArgs(array $args)
+    private function resolveArgs(array $args)
     {
-        $resolved = array();
+        $resolved = [];
         foreach ($args as $argDefinition) {
             switch ($argDefinition['type']) {
                 case 'lookup':
-                    $resolved[] = $this->_lookupRecursive($argDefinition['item']);
+                    $resolved[] = $this->lookupRecursive($argDefinition['item']);
                     break;
                 case 'value':
                     $resolved[] = $argDefinition['item'];
@@ -357,12 +371,12 @@ class Swift_DependencyContainer
     }
 
     /** Resolve a single dependency with an collections */
-    private function _lookupRecursive($item)
+    private function lookupRecursive($item)
     {
-        if (is_array($item)) {
-            $collection = array();
+        if (\is_array($item)) {
+            $collection = [];
             foreach ($item as $k => $v) {
-                $collection[$k] = $this->_lookupRecursive($v);
+                $collection[$k] = $this->lookupRecursive($v);
             }
 
             return $collection;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
index d8c72ad4d..30fc68ab0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
@@ -26,8 +26,8 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_EmbeddedFile::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.embeddedfile')
             );
@@ -39,20 +39,6 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
         }
     }
 
-    /**
-     * Create a new EmbeddedFile.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     *
-     * @return Swift_Mime_EmbeddedFile
-     */
-    public static function newInstance($data = null, $filename = null, $contentType = null)
-    {
-        return new self($data, $filename, $contentType);
-    }
-
     /**
      * Create a new EmbeddedFile from a filesystem path.
      *
@@ -62,8 +48,6 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
      */
     public static function fromPath($path)
     {
-        return self::newInstance()->setFile(
-            new Swift_ByteStream_FileByteStream($path)
-            );
+        return (new self())->setFile(new Swift_ByteStream_FileByteStream($path));
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
index 0e7b2a1b0..b1eedaa05 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -34,7 +34,7 @@ class Swift_Encoder_Base64Encoder implements Swift_Encoder
             $maxLineLength = 76;
         }
 
-        $encodedString = base64_encode($string);
+        $encodedString = base64_encode($string ?? '');
         $firstLine = '';
 
         if (0 != $firstLineOffset) {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index edec10c51..f078d6d7c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -13,7 +13,7 @@
  *
  * Possibly the most accurate RFC 2045 QP implementation found in PHP.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Encoder_QpEncoder implements Swift_Encoder
 {
@@ -22,21 +22,21 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @var Swift_CharacterStream
      */
-    protected $_charStream;
+    protected $charStream;
 
     /**
      * A filter used if input should be canonicalized.
      *
      * @var Swift_StreamFilter
      */
-    protected $_filter;
+    protected $filter;
 
     /**
      * Pre-computed QP for HUGE optimization.
      *
      * @var string[]
      */
-    protected static $_qpMap = array(
+    protected static $qpMap = [
         0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
         5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
         10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
@@ -89,16 +89,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
         245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
         250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
         255 => '=FF',
-        );
+        ];
 
-    protected static $_safeMapShare = array();
+    protected static $safeMapShare = [];
 
     /**
      * A map of non-encoded ascii characters.
      *
      * @var string[]
      */
-    protected $_safeMap = array();
+    protected $safeMap = [];
 
     /**
      * Creates a new QpEncoder for the given CharacterStream.
@@ -108,41 +108,41 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null)
     {
-        $this->_charStream = $charStream;
-        if (!isset(self::$_safeMapShare[$this->getSafeMapShareId()])) {
+        $this->charStream = $charStream;
+        if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
             $this->initSafeMap();
-            self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+            self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
         } else {
-            $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+            $this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
         }
-        $this->_filter = $filter;
+        $this->filter = $filter;
     }
 
     public function __sleep()
     {
-        return array('_charStream', '_filter');
+        return ['charStream', 'filter'];
     }
 
     public function __wakeup()
     {
-        if (!isset(self::$_safeMapShare[$this->getSafeMapShareId()])) {
+        if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
             $this->initSafeMap();
-            self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+            self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
         } else {
-            $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+            $this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
         }
     }
 
     protected function getSafeMapShareId()
     {
-        return get_class($this);
+        return static::class;
     }
 
     protected function initSafeMap()
     {
         foreach (array_merge(
-            array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
-            $this->_safeMap[$byte] = chr($byte);
+            [0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -153,9 +153,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      * If the first line needs to be shorter, indicate the difference with
      * $firstLineOffset.
      *
-     * @param string $string           to encode
-     * @param int    $firstLineOffset, optional
-     * @param int    $maxLineLength,   optional 0 indicates the default of 76 chars
+     * @param string $string          to encode
+     * @param int    $firstLineOffset optional
+     * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
      *
      * @return string
      */
@@ -167,25 +167,25 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $lines = array();
+        $lines = [];
         $lNo = 0;
         $lines[$lNo] = '';
         $currentLine = &$lines[$lNo++];
         $size = $lineLen = 0;
 
-        $this->_charStream->flushContents();
-        $this->_charStream->importString($string);
+        $this->charStream->flushContents();
+        $this->charStream->importString($string);
 
         // Fetching more than 4 chars at one is slower, as is fetching fewer bytes
         // Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
         // bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
-        while (false !== $bytes = $this->_nextSequence()) {
+        while (false !== $bytes = $this->nextSequence()) {
             // If we're filtering the input
-            if (isset($this->_filter)) {
+            if (isset($this->filter)) {
                 // If we can't filter because we need more bytes
-                while ($this->_filter->shouldBuffer($bytes)) {
+                while ($this->filter->shouldBuffer($bytes)) {
                     // Then collect bytes into the buffer
-                    if (false === $moreBytes = $this->_nextSequence(1)) {
+                    if (false === $moreBytes = $this->nextSequence(1)) {
                         break;
                     }
 
@@ -194,13 +194,13 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
                     }
                 }
                 // And filter them
-                $bytes = $this->_filter->filter($bytes);
+                $bytes = $this->filter->filter($bytes);
             }
 
-            $enc = $this->_encodeByteSequence($bytes, $size);
+            $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $lines[$lNo] = '';
@@ -211,7 +211,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
@@ -219,7 +219,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
             }
         }
 
-        return $this->_standardize(implode("=\r\n", $lines));
+        return $this->standardize(implode("=\r\n", $lines));
     }
 
     /**
@@ -229,7 +229,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     public function charsetChanged($charset)
     {
-        $this->_charStream->setCharacterSet($charset);
+        $this->charStream->setCharacterSet($charset);
     }
 
     /**
@@ -240,16 +240,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @return string
      */
-    protected function _encodeByteSequence(array $bytes, &$size)
+    protected function encodeByteSequence(array $bytes, &$size)
     {
         $ret = '';
         $size = 0;
         foreach ($bytes as $b) {
-            if (isset($this->_safeMap[$b])) {
-                $ret .= $this->_safeMap[$b];
+            if (isset($this->safeMap[$b])) {
+                $ret .= $this->safeMap[$b];
                 ++$size;
             } else {
-                $ret .= self::$_qpMap[$b];
+                $ret .= self::$qpMap[$b];
                 $size += 3;
             }
         }
@@ -264,9 +264,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @return int[]
      */
-    protected function _nextSequence($size = 4)
+    protected function nextSequence($size = 4)
     {
-        return $this->_charStream->readBytes($size);
+        return $this->charStream->readBytes($size);
     }
 
     /**
@@ -276,15 +276,15 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @return string
      */
-    protected function _standardize($string)
+    protected function standardize($string)
     {
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'),
-            array("=09\r\n", "=20\r\n", "\r\n"), $string
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
+            ["=09\r\n", "=20\r\n", "\r\n"], $string
             );
-        switch ($end = ord(substr($string, -1))) {
+        switch ($end = \ord(substr($string, -1))) {
             case 0x09:
             case 0x20:
-                $string = substr_replace($string, self::$_qpMap[$end], -1);
+                $string = substr_replace($string, self::$qpMap[$end], -1);
         }
 
         return $string;
@@ -295,6 +295,6 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     public function __clone()
     {
-        $this->_charStream = clone $this->_charStream;
+        $this->charStream = clone $this->charStream;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
index b0215e883..7eac36813 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -20,16 +20,14 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      *
      * @var Swift_CharacterStream
      */
-    private $_charStream;
+    private $charStream;
 
     /**
      * Creates a new Rfc2231Encoder using the given character stream instance.
-     *
-     * @param Swift_CharacterStream
      */
     public function __construct(Swift_CharacterStream $charStream)
     {
-        $this->_charStream = $charStream;
+        $this->charStream = $charStream;
     }
 
     /**
@@ -44,7 +42,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
         $lines[] = '';
         $currentLine = &$lines[$lineCount++];
@@ -53,15 +51,15 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
             $maxLineLength = 75;
         }
 
-        $this->_charStream->flushContents();
-        $this->_charStream->importString($string);
+        $this->charStream->flushContents();
+        $this->charStream->importString($string);
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        while (false !== $char = $this->_charStream->read(4)) {
+        while (false !== $char = $this->charStream->read(4)) {
             $encodedChar = rawurlencode($char);
-            if (0 != strlen($currentLine)
-                && strlen($currentLine.$encodedChar) > $thisLineLength) {
+            if (0 != \strlen($currentLine)
+                && \strlen($currentLine.$encodedChar) > $thisLineLength) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];
                 $thisLineLength = $maxLineLength;
@@ -79,7 +77,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function charsetChanged($charset)
     {
-        $this->_charStream->setCharacterSet($charset);
+        $this->charStream->setCharacterSet($charset);
     }
 
     /**
@@ -87,6 +85,6 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function __clone()
     {
-        $this->_charStream = clone $this->_charStream;
+        $this->charStream = clone $this->charStream;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
deleted file mode 100644
index 245878706..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Provides quick access to each encoding type.
- *
- * @author Chris Corbyn
- */
-class Swift_Encoding
-{
-    /**
-     * Get the Encoder that provides 7-bit encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function get7BitEncoding()
-    {
-        return self::_lookup('mime.7bitcontentencoder');
-    }
-
-    /**
-     * Get the Encoder that provides 8-bit encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function get8BitEncoding()
-    {
-        return self::_lookup('mime.8bitcontentencoder');
-    }
-
-    /**
-     * Get the Encoder that provides Quoted-Printable (QP) encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function getQpEncoding()
-    {
-        return self::_lookup('mime.qpcontentencoder');
-    }
-
-    /**
-     * Get the Encoder that provides Base64 encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function getBase64Encoding()
-    {
-        return self::_lookup('mime.base64contentencoder');
-    }
-
-    private static function _lookup($key)
-    {
-        return Swift_DependencyContainer::getInstance()->lookup($key);
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 674e6b5e4..18994c184 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -20,27 +20,26 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      *
      * @var string
      */
-    private $_command;
+    private $command;
 
     /**
      * An array of codes which a successful response will contain.
      *
      * @var int[]
      */
-    private $_successCodes = array();
+    private $successCodes = [];
 
     /**
      * Create a new CommandEvent for $source with $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command
-     * @param array           $successCodes
+     * @param string $command
+     * @param array  $successCodes
      */
-    public function __construct(Swift_Transport $source, $command, $successCodes = array())
+    public function __construct(Swift_Transport $source, $command, $successCodes = [])
     {
         parent::__construct($source);
-        $this->_command = $command;
-        $this->_successCodes = $successCodes;
+        $this->command = $command;
+        $this->successCodes = $successCodes;
     }
 
     /**
@@ -50,7 +49,7 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      */
     public function getCommand()
     {
-        return $this->_command;
+        return $this->command;
     }
 
     /**
@@ -60,6 +59,6 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      */
     public function getSuccessCodes()
     {
-        return $this->_successCodes;
+        return $this->successCodes;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
index 7545404e7..b158eab46 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_CommandListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
index aac36aaa7..df25a1248 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -18,30 +18,25 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_Message
-     *
      * @return Swift_Events_SendEvent
      */
-    public function createSendEvent(Swift_Transport $source, Swift_Mime_Message $message);
+    public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message);
 
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array());
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = []);
 
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -50,8 +45,6 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source);
@@ -59,25 +52,19 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex);
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener);
 
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
index 90694a9a6..24a11f44e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -16,10 +16,10 @@
 class Swift_Events_EventObject implements Swift_Events_Event
 {
     /** The source of this Event */
-    private $_source;
+    private $source;
 
     /** The state of this Event (should it bubble up the stack?) */
-    private $_bubbleCancelled = false;
+    private $bubbleCancelled = false;
 
     /**
      * Create a new EventObject originating at $source.
@@ -28,7 +28,7 @@ class Swift_Events_EventObject implements Swift_Events_Event
      */
     public function __construct($source)
     {
-        $this->_source = $source;
+        $this->source = $source;
     }
 
     /**
@@ -38,17 +38,15 @@ class Swift_Events_EventObject implements Swift_Events_Event
      */
     public function getSource()
     {
-        return $this->_source;
+        return $this->source;
     }
 
     /**
      * Prevent this Event from bubbling any further up the stack.
-     *
-     * @param bool $cancel, optional
      */
     public function cancelBubble($cancel = true)
     {
-        $this->_bubbleCancelled = $cancel;
+        $this->bubbleCancelled = $cancel;
     }
 
     /**
@@ -58,6 +56,6 @@ class Swift_Events_EventObject implements Swift_Events_Event
      */
     public function bubbleCancelled()
     {
-        return $this->_bubbleCancelled;
+        return $this->bubbleCancelled;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
index 2e92ba940..ff7c37116 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -20,27 +20,26 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      *
      * @var bool
      */
-    private $_valid;
+    private $valid;
 
     /**
      * The response received from the server.
      *
      * @var string
      */
-    private $_response;
+    private $response;
 
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid
+     * @param string $response
+     * @param bool   $valid
      */
     public function __construct(Swift_Transport $source, $response, $valid = false)
     {
         parent::__construct($source);
-        $this->_response = $response;
-        $this->_valid = $valid;
+        $this->response = $response;
+        $this->valid = $valid;
     }
 
     /**
@@ -50,7 +49,7 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      */
     public function getResponse()
     {
-        return $this->_response;
+        return $this->response;
     }
 
     /**
@@ -60,6 +59,6 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      */
     public function isValid()
     {
-        return $this->_valid;
+        return $this->valid;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
index c40919d21..85115a338 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_ResponseListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
index 10da8080f..a435691e0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -33,35 +33,32 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
     /**
      * The Message being sent.
      *
-     * @var Swift_Mime_Message
+     * @var Swift_Mime_SimpleMessage
      */
-    private $_message;
+    private $message;
 
     /**
      * Any recipients which failed after sending.
      *
      * @var string[]
      */
-    private $_failedRecipients = array();
+    private $failedRecipients = [];
 
     /**
      * The overall result as a bitmask from the class constants.
      *
      * @var int
      */
-    private $_result;
+    private $result;
 
     /**
      * Create a new SendEvent for $source and $message.
-     *
-     * @param Swift_Transport    $source
-     * @param Swift_Mime_Message $message
      */
-    public function __construct(Swift_Transport $source, Swift_Mime_Message $message)
+    public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
         parent::__construct($source);
-        $this->_message = $message;
-        $this->_result = self::RESULT_PENDING;
+        $this->message = $message;
+        $this->result = self::RESULT_PENDING;
     }
 
     /**
@@ -77,11 +74,11 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
     /**
      * Get the Message being sent.
      *
-     * @return Swift_Mime_Message
+     * @return Swift_Mime_SimpleMessage
      */
     public function getMessage()
     {
-        return $this->_message;
+        return $this->message;
     }
 
     /**
@@ -91,7 +88,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function setFailedRecipients($recipients)
     {
-        $this->_failedRecipients = $recipients;
+        $this->failedRecipients = $recipients;
     }
 
     /**
@@ -101,7 +98,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function getFailedRecipients()
     {
-        return $this->_failedRecipients;
+        return $this->failedRecipients;
     }
 
     /**
@@ -111,7 +108,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function setResult($result)
     {
-        $this->_result = $result;
+        $this->result = $result;
     }
 
     /**
@@ -124,6 +121,6 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function getResult()
     {
-        return $this->_result;
+        return $this->result;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
index d922e1bfa..f7bf55ef5 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
@@ -17,15 +17,11 @@ interface Swift_Events_SendListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt);
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
index e8aca752f..6557103c9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -16,37 +16,31 @@
 class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 {
     /** A map of event types to their associated listener types */
-    private $_eventMap = array();
+    private $eventMap = [];
 
     /** Event listeners bound to this dispatcher */
-    private $_listeners = array();
-
-    /** Listeners queued to have an Event bubbled up the stack to them */
-    private $_bubbleQueue = array();
+    private $listeners = [];
 
     /**
      * Create a new EventDispatcher.
      */
     public function __construct()
     {
-        $this->_eventMap = array(
+        $this->eventMap = [
             'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
             'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
             'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
             'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
             'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener',
-            );
+            ];
     }
 
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_Message
-     *
      * @return Swift_Events_SendEvent
      */
-    public function createSendEvent(Swift_Transport $source, Swift_Mime_Message $message)
+    public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
         return new Swift_Events_SendEvent($source, $message);
     }
@@ -54,13 +48,12 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array())
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = [])
     {
         return new Swift_Events_CommandEvent($source, $command, $successCodes);
     }
@@ -68,9 +61,8 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -82,8 +74,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source)
@@ -94,9 +84,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex)
@@ -106,51 +93,50 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener)
     {
-        foreach ($this->_listeners as $l) {
+        foreach ($this->listeners as $l) {
             // Already loaded
             if ($l === $listener) {
                 return;
             }
         }
-        $this->_listeners[] = $listener;
+        $this->listeners[] = $listener;
     }
 
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target)
     {
-        $this->_prepareBubbleQueue($evt);
-        $this->_bubble($evt, $target);
+        $bubbleQueue = $this->prepareBubbleQueue($evt);
+        $this->bubble($bubbleQueue, $evt, $target);
     }
 
     /** Queue listeners on a stack ready for $evt to be bubbled up it */
-    private function _prepareBubbleQueue(Swift_Events_EventObject $evt)
+    private function prepareBubbleQueue(Swift_Events_EventObject $evt)
     {
-        $this->_bubbleQueue = array();
-        $evtClass = get_class($evt);
-        foreach ($this->_listeners as $listener) {
-            if (array_key_exists($evtClass, $this->_eventMap)
-                && ($listener instanceof $this->_eventMap[$evtClass])) {
-                $this->_bubbleQueue[] = $listener;
+        $bubbleQueue = [];
+        $evtClass = \get_class($evt);
+        foreach ($this->listeners as $listener) {
+            if (\array_key_exists($evtClass, $this->eventMap)
+                && ($listener instanceof $this->eventMap[$evtClass])) {
+                $bubbleQueue[] = $listener;
             }
         }
+
+        return $bubbleQueue;
     }
 
     /** Bubble $evt up the stack calling $target() on each listener */
-    private function _bubble(Swift_Events_EventObject $evt, $target)
+    private function bubble(array &$bubbleQueue, Swift_Events_EventObject $evt, $target)
     {
-        if (!$evt->bubbleCancelled() && $listener = array_shift($this->_bubbleQueue)) {
+        if (!$evt->bubbleCancelled() && $listener = array_shift($bubbleQueue)) {
             $listener->$target($evt);
-            $this->_bubble($evt, $target);
+            $this->bubble($bubbleQueue, $evt, $target);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
index 253165de8..4a7492bc5 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
@@ -17,29 +17,21 @@ interface Swift_Events_TransportChangeListener extends Swift_Events_EventListene
 {
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
index f87154fb9..df442cc70 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
@@ -20,18 +20,15 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
      *
      * @var Swift_TransportException
      */
-    private $_exception;
+    private $exception;
 
     /**
      * Create a new TransportExceptionEvent for $transport.
-     *
-     * @param Swift_Transport          $transport
-     * @param Swift_TransportException $ex
      */
     public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
     {
         parent::__construct($transport);
-        $this->_exception = $ex;
+        $this->exception = $ex;
     }
 
     /**
@@ -41,6 +38,6 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
      */
     public function getException()
     {
-        return $this->_exception;
+        return $this->exception;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
index cc3c09937..ad80eb01d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_TransportExceptionListener extends Swift_Events_EventList
 {
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
index 9951c5977..af0be9179 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -20,26 +20,14 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
      *
      * @param Swift_Transport[] $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_FailoverTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_FailoverTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.failover')
             );
 
         $this->setTransports($transports);
     }
-
-    /**
-     * Create a new FailoverTransport instance.
-     *
-     * @param Swift_Transport[] $transports
-     *
-     * @return self
-     */
-    public static function newInstance($transports = array())
-    {
-        return new self($transports);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
index c82c5dbf1..7af8471c9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -17,14 +17,14 @@
 class Swift_FileSpool extends Swift_ConfigurableSpool
 {
     /** The spool directory */
-    private $_path;
+    private $path;
 
     /**
      * File WriteRetry Limit.
      *
      * @var int
      */
-    private $_retryLimit = 10;
+    private $retryLimit = 10;
 
     /**
      * Create a new FileSpool.
@@ -35,11 +35,11 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function __construct($path)
     {
-        $this->_path = $path;
+        $this->path = $path;
 
-        if (!file_exists($this->_path)) {
-            if (!mkdir($this->_path, 0777, true)) {
-                throw new Swift_IoException(sprintf('Unable to create path "%s".', $this->_path));
+        if (!file_exists($this->path)) {
+            if (!mkdir($this->path, 0777, true)) {
+                throw new Swift_IoException(sprintf('Unable to create path "%s".', $this->path));
             }
         }
     }
@@ -77,25 +77,25 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function setRetryLimit($limit)
     {
-        $this->_retryLimit = $limit;
+        $this->retryLimit = $limit;
     }
 
     /**
      * Queues a message.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param Swift_Mime_SimpleMessage $message The message to store
      *
      * @throws Swift_IoException
      *
      * @return bool
      */
-    public function queueMessage(Swift_Mime_Message $message)
+    public function queueMessage(Swift_Mime_SimpleMessage $message)
     {
         $ser = serialize($message);
-        $fileName = $this->_path.'/'.$this->getRandomString(10);
-        for ($i = 0; $i < $this->_retryLimit; ++$i) {
+        $fileName = $this->path.'/'.$this->getRandomString(10);
+        for ($i = 0; $i < $this->retryLimit; ++$i) {
             /* We try an exclusive creation of the file. This is an atomic operation, it avoid locking mechanism */
-            $fp = @fopen($fileName.'.message', 'x');
+            $fp = @fopen($fileName.'.message', 'xb');
             if (false !== $fp) {
                 if (false === fwrite($fp, $ser)) {
                     return false;
@@ -108,7 +108,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
             }
         }
 
-        throw new Swift_IoException(sprintf('Unable to create a file for enqueuing Message in "%s".', $this->_path));
+        throw new Swift_IoException(sprintf('Unable to create a file for enqueuing Message in "%s".', $this->path));
     }
 
     /**
@@ -118,10 +118,10 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function recover($timeout = 900)
     {
-        foreach (new DirectoryIterator($this->_path) as $file) {
+        foreach (new DirectoryIterator($this->path) as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -16) == '.message.sending') {
+            if ('.message.sending' == substr($file, -16)) {
                 $lockedtime = filectime($file);
                 if ((time() - $lockedtime) > $timeout) {
                     rename($file, substr($file, 0, -8));
@@ -140,12 +140,12 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
     {
-        $directoryIterator = new DirectoryIterator($this->_path);
+        $directoryIterator = new DirectoryIterator($this->path);
 
         /* Start the transport only if there are queued files to send */
         if (!$transport->isStarted()) {
             foreach ($directoryIterator as $file) {
-                if (substr($file->getRealPath(), -8) == '.message') {
+                if ('.message' == substr($file->getRealPath(), -8)) {
                     $transport->start();
                     break;
                 }
@@ -158,7 +158,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach ($directoryIterator as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -8) != '.message') {
+            if ('.message' != substr($file, -8)) {
                 continue;
             }
 
@@ -198,9 +198,9 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         // This string MUST stay FS safe, avoid special chars
         $base = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
         $ret = '';
-        $strlen = strlen($base);
+        $strlen = \strlen($base);
         for ($i = 0; $i < $count; ++$i) {
-            $ret .= $base[((int) rand(0, $strlen - 1))];
+            $ret .= $base[random_int(0, $strlen - 1)];
         }
 
         return $ret;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
index 6b75b5274..efa1b1def 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
@@ -18,8 +18,7 @@ interface Swift_Filterable
     /**
      * Add a new StreamFilter, referenced by $key.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php
new file mode 100644
index 000000000..c845d85e3
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Message ID generator.
+ */
+interface Swift_IdGenerator
+{
+    /**
+     * Returns a globally unique string to use for Message-ID or Content-ID.
+     *
+     * @return string
+     */
+    public function generateId();
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
index 4213ee27e..34c253547 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
@@ -29,20 +29,6 @@ class Swift_Image extends Swift_EmbeddedFile
         parent::__construct($data, $filename, $contentType);
     }
 
-    /**
-     * Create a new Image.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     *
-     * @return self
-     */
-    public static function newInstance($data = null, $filename = null, $contentType = null)
-    {
-        return new self($data, $filename, $contentType);
-    }
-
     /**
      * Create a new Image from a filesystem path.
      *
@@ -52,6 +38,6 @@ class Swift_Image extends Swift_EmbeddedFile
      */
     public static function fromPath($path)
     {
-        return self::newInstance()->setFile(new Swift_ByteStream_FileByteStream($path));
+        return (new self())->setFile(new Swift_ByteStream_FileByteStream($path));
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
index 56efc7593..379a5a178 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -52,7 +52,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function bind(Swift_InputByteStream $is);
+    public function bind(self $is);
 
     /**
      * Remove an already bound stream.
@@ -63,7 +63,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function unbind(Swift_InputByteStream $is);
+    public function unbind(self $is);
 
     /**
      * Flush the contents of the stream (empty it) and set the internal pointer
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
index c405f352b..5452bd416 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
@@ -18,9 +18,8 @@ class Swift_IoException extends Swift_SwiftException
     /**
      * Create a new IoException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
index cd6f786df..87f6a0742 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
@@ -38,10 +38,9 @@ interface Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
index b37f07f74..e8fef1c95 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -20,24 +20,22 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $_contents = array();
+    private $contents = [];
 
     /**
      * An InputStream for cloning.
      *
      * @var Swift_KeyCache_KeyCacheInputStream
      */
-    private $_stream;
+    private $stream;
 
     /**
      * Create a new ArrayKeyCache with the given $stream for cloning to make
      * InputByteStreams.
-     *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
     {
-        $this->_stream = $stream;
+        $this->stream = $stream;
     }
 
     /**
@@ -52,22 +50,19 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function setString($nsKey, $itemKey, $string, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
-                $this->_contents[$nsKey][$itemKey] = $string;
+                $this->contents[$nsKey][$itemKey] = $string;
                 break;
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
-                    $this->_contents[$nsKey][$itemKey] = '';
+                    $this->contents[$nsKey][$itemKey] = '';
                 }
-                $this->_contents[$nsKey][$itemKey] .= $string;
+                $this->contents[$nsKey][$itemKey] .= $string;
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -76,30 +71,27 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
                 $this->clearKey($nsKey, $itemKey);
+                // no break
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
-                    $this->_contents[$nsKey][$itemKey] = '';
+                    $this->contents[$nsKey][$itemKey] = '';
                 }
                 while (false !== $bytes = $os->read(8192)) {
-                    $this->_contents[$nsKey][$itemKey] .= $bytes;
+                    $this->contents[$nsKey][$itemKey] .= $bytes;
                 }
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -108,15 +100,14 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
     public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
     {
-        $is = clone $this->_stream;
+        $is = clone $this->stream;
         $is->setKeyCache($this);
         $is->setNsKey($nsKey);
         $is->setItemKey($itemKey);
@@ -137,9 +128,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function getString($nsKey, $itemKey)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         if ($this->hasKey($nsKey, $itemKey)) {
-            return $this->_contents[$nsKey][$itemKey];
+            return $this->contents[$nsKey][$itemKey];
         }
     }
 
@@ -152,7 +143,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         $is->write($this->getString($nsKey, $itemKey));
     }
 
@@ -166,9 +157,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function hasKey($nsKey, $itemKey)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
 
-        return array_key_exists($itemKey, $this->_contents[$nsKey]);
+        return \array_key_exists($itemKey, $this->contents[$nsKey]);
     }
 
     /**
@@ -179,7 +170,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function clearKey($nsKey, $itemKey)
     {
-        unset($this->_contents[$nsKey][$itemKey]);
+        unset($this->contents[$nsKey][$itemKey]);
     }
 
     /**
@@ -189,7 +180,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function clearAll($nsKey)
     {
-        unset($this->_contents[$nsKey]);
+        unset($this->contents[$nsKey]);
     }
 
     /**
@@ -197,10 +188,10 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @param string $nsKey
      */
-    private function _prepareCache($nsKey)
+    private function prepareCache($nsKey)
     {
-        if (!array_key_exists($nsKey, $this->_contents)) {
-            $this->_contents[$nsKey] = array();
+        if (!\array_key_exists($nsKey, $this->contents)) {
+            $this->contents[$nsKey] = [];
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
index 453f50a15..33b6367cb 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -29,44 +29,32 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @var Swift_KeyCache_KeyCacheInputStream
      */
-    private $_stream;
+    private $stream;
 
     /**
      * A path to write to.
      *
      * @var string
      */
-    private $_path;
+    private $path;
 
     /**
      * Stored keys.
      *
      * @var array
      */
-    private $_keys = array();
-
-    /**
-     * Will be true if magic_quotes_runtime is turned on.
-     *
-     * @var bool
-     */
-    private $_quotes = false;
+    private $keys = [];
 
     /**
      * Create a new DiskKeyCache with the given $stream for cloning to make
      * InputByteStreams, and the given $path to save to.
      *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
-     * @param string                             $path   to save to
+     * @param string $path to save to
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
     {
-        $this->_stream = $stream;
-        $this->_path = $path;
-
-        if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
-            $this->_quotes = true;
-        }
+        $this->stream = $stream;
+        $this->path = $path;
     }
 
     /**
@@ -83,23 +71,20 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function setString($nsKey, $itemKey, $string, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
                 break;
             case self::MODE_APPEND:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         fwrite($fp, $string);
-        $this->_freeHandle($nsKey, $itemKey);
+        $this->freeHandle($nsKey, $itemKey);
     }
 
     /**
@@ -107,34 +92,30 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      *
      * @throws Swift_IoException
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
                 break;
             case self::MODE_APPEND:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         while (false !== $bytes = $os->read(8192)) {
             fwrite($fp, $bytes);
         }
-        $this->_freeHandle($nsKey, $itemKey);
+        $this->freeHandle($nsKey, $itemKey);
     }
 
     /**
@@ -142,15 +123,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
     public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
     {
-        $is = clone $this->_stream;
+        $is = clone $this->stream;
         $is->setKeyCache($this);
         $is->setNsKey($nsKey);
         $is->setItemKey($itemKey);
@@ -173,20 +153,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function getString($nsKey, $itemKey)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         if ($this->hasKey($nsKey, $itemKey)) {
-            $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 0);
-            }
+            $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
             $str = '';
             while (!feof($fp) && false !== $bytes = fread($fp, 8192)) {
                 $str .= $bytes;
             }
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 1);
-            }
-            $this->_freeHandle($nsKey, $itemKey);
+            $this->freeHandle($nsKey, $itemKey);
 
             return $str;
         }
@@ -202,17 +176,11 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
     public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
     {
         if ($this->hasKey($nsKey, $itemKey)) {
-            $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 0);
-            }
+            $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
             while (!feof($fp) && false !== $bytes = fread($fp, 8192)) {
                 $is->write($bytes);
             }
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 1);
-            }
-            $this->_freeHandle($nsKey, $itemKey);
+            $this->freeHandle($nsKey, $itemKey);
         }
     }
 
@@ -226,7 +194,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function hasKey($nsKey, $itemKey)
     {
-        return is_file($this->_path.'/'.$nsKey.'/'.$itemKey);
+        return is_file($this->path.'/'.$nsKey.'/'.$itemKey);
     }
 
     /**
@@ -238,8 +206,8 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
     public function clearKey($nsKey, $itemKey)
     {
         if ($this->hasKey($nsKey, $itemKey)) {
-            $this->_freeHandle($nsKey, $itemKey);
-            unlink($this->_path.'/'.$nsKey.'/'.$itemKey);
+            $this->freeHandle($nsKey, $itemKey);
+            unlink($this->path.'/'.$nsKey.'/'.$itemKey);
         }
     }
 
@@ -250,14 +218,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function clearAll($nsKey)
     {
-        if (array_key_exists($nsKey, $this->_keys)) {
-            foreach ($this->_keys[$nsKey] as $itemKey => $null) {
+        if (\array_key_exists($nsKey, $this->keys)) {
+            foreach ($this->keys[$nsKey] as $itemKey => $null) {
                 $this->clearKey($nsKey, $itemKey);
             }
-            if (is_dir($this->_path.'/'.$nsKey)) {
-                rmdir($this->_path.'/'.$nsKey);
+            if (is_dir($this->path.'/'.$nsKey)) {
+                rmdir($this->path.'/'.$nsKey);
             }
-            unset($this->_keys[$nsKey]);
+            unset($this->keys[$nsKey]);
         }
     }
 
@@ -266,14 +234,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @param string $nsKey
      */
-    private function _prepareCache($nsKey)
+    private function prepareCache($nsKey)
     {
-        $cacheDir = $this->_path.'/'.$nsKey;
+        $cacheDir = $this->path.'/'.$nsKey;
         if (!is_dir($cacheDir)) {
             if (!mkdir($cacheDir)) {
                 throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
             }
-            $this->_keys[$nsKey] = array();
+            $this->keys[$nsKey] = [];
         }
     }
 
@@ -286,27 +254,27 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @return resource
      */
-    private function _getHandle($nsKey, $itemKey, $position)
+    private function getHandle($nsKey, $itemKey, $position)
     {
-        if (!isset($this->_keys[$nsKey][$itemKey])) {
+        if (!isset($this->keys[$nsKey][$itemKey])) {
             $openMode = $this->hasKey($nsKey, $itemKey) ? 'r+b' : 'w+b';
-            $fp = fopen($this->_path.'/'.$nsKey.'/'.$itemKey, $openMode);
-            $this->_keys[$nsKey][$itemKey] = $fp;
+            $fp = fopen($this->path.'/'.$nsKey.'/'.$itemKey, $openMode);
+            $this->keys[$nsKey][$itemKey] = $fp;
         }
         if (self::POSITION_START == $position) {
-            fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_SET);
+            fseek($this->keys[$nsKey][$itemKey], 0, SEEK_SET);
         } elseif (self::POSITION_END == $position) {
-            fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_END);
+            fseek($this->keys[$nsKey][$itemKey], 0, SEEK_END);
         }
 
-        return $this->_keys[$nsKey][$itemKey];
+        return $this->keys[$nsKey][$itemKey];
     }
 
-    private function _freeHandle($nsKey, $itemKey)
+    private function freeHandle($nsKey, $itemKey)
     {
-        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_CURRENT);
+        $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_CURRENT);
         fclose($fp);
-        $this->_keys[$nsKey][$itemKey] = null;
+        $this->keys[$nsKey][$itemKey] = null;
     }
 
     /**
@@ -314,8 +282,13 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function __destruct()
     {
-        foreach ($this->_keys as $nsKey => $null) {
+        foreach ($this->keys as $nsKey => $null) {
             $this->clearAll($nsKey);
         }
     }
+
+    public function __wakeup()
+    {
+        $this->keys = [];
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
index af80bdca6..be2dbba0c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
@@ -17,8 +17,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 {
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache);
 
@@ -38,8 +36,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
index 4efe78564..957b1b2a0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -34,10 +34,9 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -48,9 +47,8 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
index b00d458a6..03bab481e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -16,35 +16,31 @@
 class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCacheInputStream
 {
     /** The KeyCache being written to */
-    private $_keyCache;
+    private $keyCache;
 
     /** The nsKey of the KeyCache being written to */
-    private $_nsKey;
+    private $nsKey;
 
     /** The itemKey of the KeyCache being written to */
-    private $_itemKey;
+    private $itemKey;
 
     /** A stream to write through on each write() */
-    private $_writeThrough = null;
+    private $writeThrough = null;
 
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache)
     {
-        $this->_keyCache = $keyCache;
+        $this->keyCache = $keyCache;
     }
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is)
     {
-        $this->_writeThrough = $is;
+        $this->writeThrough = $is;
     }
 
     /**
@@ -55,14 +51,14 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function write($bytes, Swift_InputByteStream $is = null)
     {
-        $this->_keyCache->setString(
-            $this->_nsKey, $this->_itemKey, $bytes, Swift_KeyCache::MODE_APPEND
+        $this->keyCache->setString(
+            $this->nsKey, $this->itemKey, $bytes, Swift_KeyCache::MODE_APPEND
             );
         if (isset($is)) {
             $is->write($bytes);
         }
-        if (isset($this->_writeThrough)) {
-            $this->_writeThrough->write($bytes);
+        if (isset($this->writeThrough)) {
+            $this->writeThrough->write($bytes);
         }
     }
 
@@ -93,7 +89,7 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function flushBuffers()
     {
-        $this->_keyCache->clearKey($this->_nsKey, $this->_itemKey);
+        $this->keyCache->clearKey($this->nsKey, $this->itemKey);
     }
 
     /**
@@ -103,7 +99,7 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function setNsKey($nsKey)
     {
-        $this->_nsKey = $nsKey;
+        $this->nsKey = $nsKey;
     }
 
     /**
@@ -113,7 +109,7 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function setItemKey($itemKey)
     {
-        $this->_itemKey = $itemKey;
+        $this->itemKey = $itemKey;
     }
 
     /**
@@ -122,6 +118,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function __clone()
     {
-        $this->_writeThrough = null;
+        $this->writeThrough = null;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
index e151b8a9c..244b5f602 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -20,26 +20,14 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
      *
      * @param array $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_LoadBalancedTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.loadbalanced')
             );
 
         $this->setTransports($transports);
     }
-
-    /**
-     * Create a new LoadBalancedTransport instance.
-     *
-     * @param array $transports
-     *
-     * @return self
-     */
-    public static function newInstance($transports = array())
-    {
-        return new self($transports);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
deleted file mode 100644
index 18556989a..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Sends Messages using the mail() function.
- *
- * @author Chris Corbyn
- *
- * @deprecated since 5.4.5 (to be removed in 6.0)
- */
-class Swift_MailTransport extends Swift_Transport_MailTransport
-{
-    /**
-     * Create a new MailTransport, optionally specifying $extraParams.
-     *
-     * @param string $extraParams
-     */
-    public function __construct($extraParams = '-f%s')
-    {
-        call_user_func_array(
-            array($this, 'Swift_Transport_MailTransport::__construct'),
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('transport.mail')
-            );
-
-        $this->setExtraParams($extraParams);
-    }
-
-    /**
-     * Create a new MailTransport instance.
-     *
-     * @param string $extraParams To be passed to mail()
-     *
-     * @return self
-     */
-    public static function newInstance($extraParams = '-f%s')
-    {
-        return new self($extraParams);
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
index 8314fe8fc..57630074c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
@@ -16,28 +16,14 @@
 class Swift_Mailer
 {
     /** The Transport used to send messages */
-    private $_transport;
+    private $transport;
 
     /**
      * Create a new Mailer using $transport for delivery.
-     *
-     * @param Swift_Transport $transport
      */
     public function __construct(Swift_Transport $transport)
     {
-        $this->_transport = $transport;
-    }
-
-    /**
-     * Create a new Mailer instance.
-     *
-     * @param Swift_Transport $transport
-     *
-     * @return self
-     */
-    public static function newInstance(Swift_Transport $transport)
-    {
-        return new self($transport);
+        $this->transport = $transport;
     }
 
     /**
@@ -66,23 +52,23 @@ class Swift_Mailer
      * The return value is the number of recipients who were accepted for
      * delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param array              $failedRecipients An array of failures by-reference
+     * @param array $failedRecipients An array of failures by-reference
      *
      * @return int The number of successful recipients. Can be 0 which indicates failure
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
         $failedRecipients = (array) $failedRecipients;
 
-        if (!$this->_transport->isStarted()) {
-            $this->_transport->start();
+        // FIXME: to be removed in 7.0 (as transport must now start itself on send)
+        if (!$this->transport->isStarted()) {
+            $this->transport->start();
         }
 
         $sent = 0;
 
         try {
-            $sent = $this->_transport->send($message, $failedRecipients);
+            $sent = $this->transport->send($message, $failedRecipients);
         } catch (Swift_RfcComplianceException $e) {
             foreach ($message->getTo() as $address => $name) {
                 $failedRecipients[] = $address;
@@ -94,12 +80,10 @@ class Swift_Mailer
 
     /**
      * Register a plugin using a known unique key (e.g. myPlugin).
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_transport->registerPlugin($plugin);
+        $this->transport->registerPlugin($plugin);
     }
 
     /**
@@ -109,6 +93,6 @@ class Swift_Mailer
      */
     public function getTransport()
     {
-        return $this->_transport;
+        return $this->transport;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
index e3e6cad05..19aa82a9c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -20,16 +20,14 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      *
      * @var array
      */
-    private $_recipients = array();
+    private $recipients = [];
 
     /**
      * Create a new ArrayRecipientIterator from $recipients.
-     *
-     * @param array $recipients
      */
     public function __construct(array $recipients)
     {
-        $this->_recipients = $recipients;
+        $this->recipients = $recipients;
     }
 
     /**
@@ -39,7 +37,7 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      */
     public function hasNext()
     {
-        return !empty($this->_recipients);
+        return !empty($this->recipients);
     }
 
     /**
@@ -50,6 +48,6 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      */
     public function nextRecipient()
     {
-        return array_splice($this->_recipients, 0, 1);
+        return array_splice($this->recipients, 0, 1);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
index 2cafb6751..e3b0894d8 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -15,7 +15,7 @@
  */
 class Swift_MemorySpool implements Swift_Spool
 {
-    protected $messages = array();
+    protected $messages = [];
     private $flushRetries = 3;
 
     /**
@@ -53,11 +53,11 @@ class Swift_MemorySpool implements Swift_Spool
     /**
      * Stores a message in the queue.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param Swift_Mime_SimpleMessage $message The message to store
      *
      * @return bool Whether the operation has succeeded
      */
-    public function queueMessage(Swift_Mime_Message $message)
+    public function queueMessage(Swift_Mime_SimpleMessage $message)
     {
         //clone the message to make sure it is not changed while in the queue
         $this->messages[] = clone $message;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
index 242cbf314..5c5834e23 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -18,17 +18,17 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     /**
      * @var Swift_Signers_HeaderSigner[]
      */
-    private $headerSigners = array();
+    private $headerSigners = [];
 
     /**
      * @var Swift_Signers_BodySigner[]
      */
-    private $bodySigners = array();
+    private $bodySigners = [];
 
     /**
      * @var array
      */
-    private $savedMessage = array();
+    private $savedMessage = [];
 
     /**
      * Create a new Message.
@@ -42,8 +42,8 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_SimpleMessage::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_SimpleMessage::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.message')
             );
@@ -60,21 +60,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         }
     }
 
-    /**
-     * Create a new Message.
-     *
-     * @param string $subject
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     *
-     * @return $this
-     */
-    public static function newInstance($subject = null, $body = null, $contentType = null, $charset = null)
-    {
-        return new self($subject, $body, $contentType, $charset);
-    }
-
     /**
      * Add a MimePart to this Message.
      *
@@ -86,13 +71,11 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     public function addPart($body, $contentType = null, $charset = null)
     {
-        return $this->attach(Swift_MimePart::newInstance($body, $contentType, $charset)->setEncoder($this->getEncoder()));
+        return $this->attach((new Swift_MimePart($body, $contentType, $charset))->setEncoder($this->getEncoder()));
     }
 
     /**
-     * Detach a signature handler from a message.
-     *
-     * @param Swift_Signer $signer
+     * Attach a new signature handler to the message.
      *
      * @return $this
      */
@@ -108,9 +91,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Attach a new signature handler to the message.
-     *
-     * @param Swift_Signer $signer
+     * Detach a signature handler from a message.
      *
      * @return $this
      */
@@ -137,6 +118,19 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         return $this;
     }
 
+    /**
+     * Clear all signature handlers attached to the message.
+     *
+     * @return $this
+     */
+    public function clearSigners()
+    {
+        $this->headerSigners = [];
+        $this->bodySigners = [];
+
+        return $this;
+    }
+
     /**
      * Get this message as a complete string.
      *
@@ -161,8 +155,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -205,7 +197,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
             $signer->setHeaders($this->getHeaders());
 
             $signer->startBody();
-            $this->_bodyToByteStream($signer);
+            $this->bodyToByteStream($signer);
             $signer->endBody();
 
             $signer->addSignature($this->getHeaders());
@@ -217,24 +209,22 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     protected function saveMessage()
     {
-        $this->savedMessage = array('headers' => array());
+        $this->savedMessage = ['headers' => []];
         $this->savedMessage['body'] = $this->getBody();
         $this->savedMessage['children'] = $this->getChildren();
-        if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->_becomeMimePart()), $this->savedMessage['children']));
+        if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
             $this->setBody('');
         }
     }
 
     /**
      * save the original headers.
-     *
-     * @param array $altered
      */
     protected function saveHeaders(array $altered)
     {
         foreach ($altered as $head) {
-            $lc = strtolower($head);
+            $lc = strtolower($head ?? '');
 
             if (!isset($this->savedMessage['headers'][$lc])) {
                 $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
@@ -267,7 +257,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         $this->setChildren($this->savedMessage['children']);
 
         $this->restoreHeaders();
-        $this->savedMessage = array();
+        $this->savedMessage = [];
     }
 
     /**
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index d5ba14b91..d994373bd 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -16,23 +16,19 @@
 class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
 {
     /** Recognized MIME types */
-    private $_mimeTypes = array();
+    private $mimeTypes = [];
 
     /**
      * Create a new Attachment with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param array                     $mimeTypes optional
+     * @param array $mimeTypes
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
-        parent::__construct($headers, $encoder, $cache, $grammar);
+        parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setDisposition('attachment');
         $this->setContentType('application/octet-stream');
-        $this->_mimeTypes = $mimeTypes;
+        $this->mimeTypes = $mimeTypes;
     }
 
     /**
@@ -56,7 +52,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function getDisposition()
     {
-        return $this->_getHeaderFieldModel('Content-Disposition');
+        return $this->getHeaderFieldModel('Content-Disposition');
     }
 
     /**
@@ -68,7 +64,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function setDisposition($disposition)
     {
-        if (!$this->_setHeaderFieldModel('Content-Disposition', $disposition)) {
+        if (!$this->setHeaderFieldModel('Content-Disposition', $disposition)) {
             $this->getHeaders()->addParameterizedHeader('Content-Disposition', $disposition);
         }
 
@@ -82,7 +78,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function getFilename()
     {
-        return $this->_getHeaderParameter('Content-Disposition', 'filename');
+        return $this->getHeaderParameter('Content-Disposition', 'filename');
     }
 
     /**
@@ -94,8 +90,8 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function setFilename($filename)
     {
-        $this->_setHeaderParameter('Content-Disposition', 'filename', $filename);
-        $this->_setHeaderParameter('Content-Type', 'name', $filename);
+        $this->setHeaderParameter('Content-Disposition', 'filename', $filename);
+        $this->setHeaderParameter('Content-Type', 'name', $filename);
 
         return $this;
     }
@@ -107,7 +103,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function getSize()
     {
-        return $this->_getHeaderParameter('Content-Disposition', 'size');
+        return $this->getHeaderParameter('Content-Disposition', 'size');
     }
 
     /**
@@ -119,7 +115,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function setSize($size)
     {
-        $this->_setHeaderParameter('Content-Disposition', 'size', $size);
+        $this->setHeaderParameter('Content-Disposition', 'size', $size);
 
         return $this;
     }
@@ -127,8 +123,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
     /**
      * Set the file that this attachment is for.
      *
-     * @param Swift_FileStream $file
-     * @param string           $contentType optional
+     * @param string $contentType optional
      *
      * @return $this
      */
@@ -139,8 +134,8 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
         if (!isset($contentType)) {
             $extension = strtolower(substr($file->getPath(), strrpos($file->getPath(), '.') + 1));
 
-            if (array_key_exists($extension, $this->_mimeTypes)) {
-                $this->setContentType($this->_mimeTypes[$extension]);
+            if (\array_key_exists($extension, $this->mimeTypes)) {
+                $this->setContentType($this->mimeTypes[$extension]);
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 8f76d70f3..b7e1e0283 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -18,10 +18,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     * @param int $firstLineOffset
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -30,7 +27,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         }
 
         $remainder = 0;
-        $base64ReadBufferRemainderBytes = null;
+        $base64ReadBufferRemainderBytes = '';
 
         // To reduce memory usage, the output buffer is streamed to the input buffer like so:
         //   Output Stream => base64encode => wrap line length => Input Stream
@@ -41,17 +38,17 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         // When the OutputStream is empty, we must flush any remainder bytes.
         while (true) {
             $readBytes = $os->read(8192);
-            $atEOF = ($readBytes === false);
+            $atEOF = (false === $readBytes);
 
             if ($atEOF) {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes;
             } else {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
             }
-            $base64ReadBufferRemainderBytes = null;
-            $bytesLength = strlen($streamTheseBytes);
+            $base64ReadBufferRemainderBytes = '';
+            $bytesLength = \strlen($streamTheseBytes);
 
-            if ($bytesLength === 0) { // no data left to encode
+            if (0 === $bytesLength) { // no data left to encode
                 break;
             }
 
@@ -59,7 +56,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             // and carry over remainder 1-2 bytes to the next loop iteration
             if (!$atEOF) {
                 $excessBytes = $bytesLength % 3;
-                if ($excessBytes !== 0) {
+                if (0 !== $excessBytes) {
                     $base64ReadBufferRemainderBytes = substr($streamTheseBytes, -$excessBytes);
                     $streamTheseBytes = substr($streamTheseBytes, 0, $bytesLength - $excessBytes);
                 }
@@ -69,7 +66,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             $encodedTransformed = '';
             $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
 
-            while ($thisMaxLineLength < strlen($encoded)) {
+            while ($thisMaxLineLength < \strlen($encoded)) {
                 $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength)."\r\n";
                 $firstLineOffset = 0;
                 $encoded = substr($encoded, $thisMaxLineLength);
@@ -77,7 +74,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
                 $remainder = 0;
             }
 
-            if (0 < $remainingLength = strlen($encoded)) {
+            if (0 < $remainingLength = \strlen($encoded)) {
                 $remainder += $remainingLength;
                 $encodedTransformed .= $encoded;
                 $encoded = null;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
index 710b5ac9e..8dfea605f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -16,16 +16,16 @@
 class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
-     * @param null|string $charset
+     * @param string|null $charset
      */
     public function __construct($charset = null)
     {
-        $this->charset = $charset ? $charset : 'utf-8';
+        $this->charset = $charset ?: 'utf-8';
     }
 
     /**
@@ -50,9 +50,8 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
         $string = '';
@@ -87,12 +86,11 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
-        return $this->_standardize(quoted_printable_encode($string));
+        return $this->standardize(quoted_printable_encode($string));
     }
 
     /**
@@ -102,14 +100,14 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      *
      * @return string
      */
-    protected function _standardize($string)
+    protected function standardize($string)
     {
         // transform CR or LF to CRLF
         $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
         // transform =0D=0A to CRLF
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'), array("=09\r\n", "=20\r\n", "\r\n"), $string);
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        switch ($end = ord(substr($string, -1))) {
+        switch (\ord(substr($string, -1))) {
             case 0x09:
                 $string = substr_replace($string, '=09', -1);
                 break;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
new file mode 100644
index 000000000..6539de77b
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles the case where the email body is already encoded and you just need specify the correct
+ * encoding without actually changing the encoding of the body.
+ *
+ * @author Jan Flora <jf@penneo.com>
+ */
+class Swift_Mime_ContentEncoder_NullContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * The name of this encoding scheme (probably 7bit or 8bit).
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
+     *
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   ignored
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $string;
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        while (false !== ($bytes = $os->read(8192))) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
index 219f482ce..72592fc58 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -11,6 +11,10 @@
 /**
  * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
+ *
  * @author Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
@@ -20,25 +24,25 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      *
      * @var string
      */
-    private $_name;
+    private $name;
 
     /**
      * True if canonical transformations should be done.
      *
      * @var bool
      */
-    private $_canonical;
+    private $canonical;
 
     /**
      * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
      *
      * @param string $name
-     * @param bool   $canonical If canonicalization transformation should be done.
+     * @param bool   $canonical if canonicalization transformation should be done
      */
     public function __construct($name, $canonical = false)
     {
-        $this->_name = $name;
-        $this->_canonical = $canonical;
+        $this->name = $name;
+        $this->canonical = $canonical;
     }
 
     /**
@@ -52,37 +56,35 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->_canonical) {
-            $string = $this->_canonicalize($string);
+        if ($this->canonical) {
+            $string = $this->canonicalize($string);
         }
 
-        return $this->_safeWordWrap($string, $maxLineLength, "\r\n");
+        return $this->safeWordwrap($string, $maxLineLength, "\r\n");
     }
 
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   optional, 0 means no wrapping will occur
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
         $leftOver = '';
         while (false !== $bytes = $os->read(8192)) {
             $toencode = $leftOver.$bytes;
-            if ($this->_canonical) {
-                $toencode = $this->_canonicalize($toencode);
+            if ($this->canonical) {
+                $toencode = $this->canonicalize($toencode);
             }
-            $wrapped = $this->_safeWordWrap($toencode, $maxLineLength, "\r\n");
+            $wrapped = $this->safeWordwrap($toencode, $maxLineLength, "\r\n");
             $lastLinePos = strrpos($wrapped, "\r\n");
             $leftOver = substr($wrapped, $lastLinePos);
             $wrapped = substr($wrapped, 0, $lastLinePos);
 
             $is->write($wrapped);
         }
-        if (strlen($leftOver)) {
+        if (\strlen($leftOver)) {
             $is->write($leftOver);
         }
     }
@@ -94,7 +96,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      */
     public function getName()
     {
-        return $this->_name;
+        return $this->name;
     }
 
     /**
@@ -113,7 +115,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      *
      * @return string
      */
-    private function _safeWordwrap($string, $length = 75, $le = "\r\n")
+    private function safeWordwrap($string, $length = 75, $le = "\r\n")
     {
         if (0 >= $length) {
             return $string;
@@ -121,7 +123,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
         $originalLines = explode($le, $string);
 
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
 
         foreach ($originalLines as $originalLine) {
@@ -132,8 +134,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
             $chunks = preg_split('/(?<=\s)/', $originalLine);
 
             foreach ($chunks as $chunk) {
-                if (0 != strlen($currentLine)
-                    && strlen($currentLine.$chunk) > $length) {
+                if (0 != \strlen($currentLine)
+                    && \strlen($currentLine.$chunk) > $length) {
                     $lines[] = '';
                     $currentLine = &$lines[$lineCount++];
                 }
@@ -151,11 +153,11 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      *
      * @return string
      */
-    private function _canonicalize($string)
+    private function canonicalize($string)
     {
         return str_replace(
-            array("\r\n", "\r", "\n"),
-            array("\n", "\n", "\r\n"),
+            ["\r\n", "\r", "\n"],
+            ["\n", "\n", "\r\n"],
             $string
             );
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
index 5cc907b8e..465ffd878 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -11,11 +11,11 @@
 /**
  * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_ContentEncoder
 {
-    protected $_dotEscape;
+    protected $dotEscape;
 
     /**
      * Creates a new QpContentEncoder for the given CharacterStream.
@@ -26,26 +26,26 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
      */
     public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null, $dotEscape = false)
     {
-        $this->_dotEscape = $dotEscape;
+        $this->dotEscape = $dotEscape;
         parent::__construct($charStream, $filter);
     }
 
     public function __sleep()
     {
-        return array('_charStream', '_filter', '_dotEscape');
+        return ['charStream', 'filter', 'dotEscape'];
     }
 
     protected function getSafeMapShareId()
     {
-        return get_class($this).($this->_dotEscape ? '.dotEscape' : '');
+        return static::class.($this->dotEscape ? '.dotEscape' : '');
     }
 
     protected function initSafeMap()
     {
         parent::initSafeMap();
-        if ($this->_dotEscape) {
+        if ($this->dotEscape) {
             /* Encode . as =2e for buggy remote servers */
-            unset($this->_safeMap[0x2e]);
+            unset($this->safeMap[0x2e]);
         }
     }
 
@@ -69,20 +69,20 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $this->_charStream->flushContents();
-        $this->_charStream->importByteStream($os);
+        $this->charStream->flushContents();
+        $this->charStream->importByteStream($os);
 
         $currentLine = '';
         $prepend = '';
         $size = $lineLen = 0;
 
-        while (false !== $bytes = $this->_nextSequence()) {
+        while (false !== $bytes = $this->nextSequence()) {
             // If we're filtering the input
-            if (isset($this->_filter)) {
+            if (isset($this->filter)) {
                 // If we can't filter because we need more bytes
-                while ($this->_filter->shouldBuffer($bytes)) {
+                while ($this->filter->shouldBuffer($bytes)) {
                     // Then collect bytes into the buffer
-                    if (false === $moreBytes = $this->_nextSequence(1)) {
+                    if (false === $moreBytes = $this->nextSequence(1)) {
                         break;
                     }
 
@@ -91,16 +91,16 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
                     }
                 }
                 // And filter them
-                $bytes = $this->_filter->filter($bytes);
+                $bytes = $this->filter->filter($bytes);
             }
 
-            $enc = $this->_encodeByteSequence($bytes, $size);
+            $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
-                $is->write($prepend.$this->_standardize($currentLine));
+                $is->write($prepend.$this->standardize($currentLine));
                 $currentLine = '';
                 $prepend = "=\r\n";
                 $thisLineLength = $maxLineLength;
@@ -109,15 +109,15 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
                 $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
             }
         }
-        if (strlen($currentLine)) {
-            $is->write($prepend.$this->_standardize($currentLine));
+        if (\strlen($currentLine)) {
+            $is->write($prepend.$this->standardize($currentLine));
         }
     }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
index 3214e1cf3..f3ece43ae 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -28,16 +28,14 @@ class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_Cont
     private $nativeEncoder;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
      * Constructor.
      *
-     * @param Swift_Mime_ContentEncoder_QpContentEncoder       $safeEncoder
-     * @param Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder
-     * @param string|null                                      $charset
+     * @param string|null $charset
      */
     public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
index 0b8526e38..870e7f41a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
@@ -11,6 +11,9 @@
 /**
  * Handles raw Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
  *
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
  */
@@ -33,10 +36,8 @@ class Swift_Mime_ContentEncoder_RawContentEncoder implements Swift_Mime_ContentE
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $in
-     * @param Swift_InputByteStream  $out
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   ignored
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
index 6af757124..42a51770c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -18,15 +18,11 @@ class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
     /**
      * Creates a new Attachment with $headers and $encoder.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param array                     $mimeTypes optional
+     * @param array $mimeTypes optional
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
-        parent::__construct($headers, $encoder, $cache, $grammar, $mimeTypes);
+        parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
         $this->setDisposition('inline');
         $this->setId($this->getId());
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
index cc44a6efb..1a952ece1 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
@@ -17,8 +17,6 @@ interface Swift_Mime_EncodingObserver
 {
     /**
      * Notify this observer that the observed entity's ContentEncoder has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php
deleted file mode 100644
index a09f33831..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines the grammar to use for validation, implements the RFC 2822 (and friends) ABNF grammar definitions.
- *
- * @author     Fabien Potencier
- * @author     Chris Corbyn
- */
-class Swift_Mime_Grammar
-{
-    /**
-     * Special characters used in the syntax which need to be escaped.
-     *
-     * @var string[]
-     */
-    private static $_specials = array();
-
-    /**
-     * Tokens defined in RFC 2822 (and some related RFCs).
-     *
-     * @var string[]
-     */
-    private static $_grammar = array();
-
-    /**
-     * Initialize some RFC 2822 (and friends) ABNF grammar definitions.
-     */
-    public function __construct()
-    {
-        $this->init();
-    }
-
-    public function __wakeup()
-    {
-        $this->init();
-    }
-
-    protected function init()
-    {
-        if (count(self::$_specials) > 0) {
-            return;
-        }
-
-        self::$_specials = array(
-            '(', ')', '<', '>', '[', ']',
-            ':', ';', '@', ',', '.', '"',
-            );
-
-        /*** Refer to RFC 2822 for ABNF grammar ***/
-
-        // All basic building blocks
-        self::$_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
-        self::$_grammar['WSP'] = '[ \t]';
-        self::$_grammar['CRLF'] = '(?:\r\n)';
-        self::$_grammar['FWS'] = '(?:(?:'.self::$_grammar['WSP'].'*'.
-                self::$_grammar['CRLF'].')?'.self::$_grammar['WSP'].')';
-        self::$_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
-        self::$_grammar['quoted-pair'] = '(?:\\\\'.self::$_grammar['text'].')';
-        self::$_grammar['ctext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
-                '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
-        // Uses recursive PCRE (?1) -- could be a weak point??
-        self::$_grammar['ccontent'] = '(?:'.self::$_grammar['ctext'].'|'.
-                self::$_grammar['quoted-pair'].'|(?1))';
-        self::$_grammar['comment'] = '(\((?:'.self::$_grammar['FWS'].'|'.
-                self::$_grammar['ccontent'].')*'.self::$_grammar['FWS'].'?\))';
-        self::$_grammar['CFWS'] = '(?:(?:'.self::$_grammar['FWS'].'?'.
-                self::$_grammar['comment'].')*(?:(?:'.self::$_grammar['FWS'].'?'.
-                self::$_grammar['comment'].')|'.self::$_grammar['FWS'].'))';
-        self::$_grammar['qtext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
-                '|[\x21\x23-\x5B\x5D-\x7E])';
-        self::$_grammar['qcontent'] = '(?:'.self::$_grammar['qtext'].'|'.
-                self::$_grammar['quoted-pair'].')';
-        self::$_grammar['quoted-string'] = '(?:'.self::$_grammar['CFWS'].'?"'.
-                '('.self::$_grammar['FWS'].'?'.self::$_grammar['qcontent'].')*'.
-                self::$_grammar['FWS'].'?"'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
-        self::$_grammar['atom'] = '(?:'.self::$_grammar['CFWS'].'?'.
-                self::$_grammar['atext'].'+'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['dot-atom-text'] = '(?:'.self::$_grammar['atext'].'+'.
-                '(\.'.self::$_grammar['atext'].'+)*)';
-        self::$_grammar['dot-atom'] = '(?:'.self::$_grammar['CFWS'].'?'.
-                self::$_grammar['dot-atom-text'].'+'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['word'] = '(?:'.self::$_grammar['atom'].'|'.
-                self::$_grammar['quoted-string'].')';
-        self::$_grammar['phrase'] = '(?:'.self::$_grammar['word'].'+?)';
-        self::$_grammar['no-fold-quote'] = '(?:"(?:'.self::$_grammar['qtext'].
-                '|'.self::$_grammar['quoted-pair'].')*")';
-        self::$_grammar['dtext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
-                '|[\x21-\x5A\x5E-\x7E])';
-        self::$_grammar['no-fold-literal'] = '(?:\[(?:'.self::$_grammar['dtext'].
-                '|'.self::$_grammar['quoted-pair'].')*\])';
-
-        // Message IDs
-        self::$_grammar['id-left'] = '(?:'.self::$_grammar['dot-atom-text'].'|'.
-                self::$_grammar['no-fold-quote'].')';
-        self::$_grammar['id-right'] = '(?:'.self::$_grammar['dot-atom-text'].'|'.
-                self::$_grammar['no-fold-literal'].')';
-
-        // Addresses, mailboxes and paths
-        self::$_grammar['local-part'] = '(?:'.self::$_grammar['dot-atom'].'|'.
-                self::$_grammar['quoted-string'].')';
-        self::$_grammar['dcontent'] = '(?:'.self::$_grammar['dtext'].'|'.
-                self::$_grammar['quoted-pair'].')';
-        self::$_grammar['domain-literal'] = '(?:'.self::$_grammar['CFWS'].'?\[('.
-                self::$_grammar['FWS'].'?'.self::$_grammar['dcontent'].')*?'.
-                self::$_grammar['FWS'].'?\]'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['domain'] = '(?:'.self::$_grammar['dot-atom'].'|'.
-                self::$_grammar['domain-literal'].')';
-        self::$_grammar['addr-spec'] = '(?:'.self::$_grammar['local-part'].'@'.
-                self::$_grammar['domain'].')';
-    }
-
-    /**
-     * Get the grammar defined for $name token.
-     *
-     * @param string $name exactly as written in the RFC
-     *
-     * @return string
-     */
-    public function getDefinition($name)
-    {
-        if (array_key_exists($name, self::$_grammar)) {
-            return self::$_grammar[$name];
-        }
-
-        throw new Swift_RfcComplianceException(
-            "No such grammar '".$name."' defined."
-        );
-    }
-
-    /**
-     * Returns the tokens defined in RFC 2822 (and some related RFCs).
-     *
-     * @return array
-     */
-    public function getGrammarDefinitions()
-    {
-        return self::$_grammar;
-    }
-
-    /**
-     * Returns the current special characters used in the syntax which need to be escaped.
-     *
-     * @return array
-     */
-    public function getSpecials()
-    {
-        return self::$_specials;
-    }
-
-    /**
-     * Escape special characters in a string (convert to quoted-pairs).
-     *
-     * @param string   $token
-     * @param string[] $include additional chars to escape
-     * @param string[] $exclude chars from escaping
-     *
-     * @return string
-     */
-    public function escapeSpecials($token, $include = array(), $exclude = array())
-    {
-        foreach (array_merge(array('\\'), array_diff(self::$_specials, $exclude), $include) as $char) {
-            $token = str_replace($char, '\\'.$char, $token);
-        }
-
-        return $token;
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
index a8ddd2721..ca712f35a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -85,7 +85,7 @@ interface Swift_Mime_Header
     public function getFieldBody();
 
     /**
-     * Get this Header rendered as a compliant string.
+     * Get this Header rendered as a compliant string, including trailing CRLF.
      *
      * @return string
      */
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index 83a4f2f3b..21c8aaabf 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -41,7 +41,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64E
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
     {
-        if (strtolower($charset) === 'iso-2022-jp') {
+        if ('iso-2022-jp' === strtolower($charset ?? '')) {
             $old = mb_internal_encoding();
             mb_internal_encoding('utf-8');
             $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
index 510dd6637..378c48050 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -29,9 +29,9 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
     {
         foreach (array_merge(
             range(0x61, 0x7A), range(0x41, 0x5A),
-            range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+            range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
         ) as $byte) {
-            $this->_safeMap[$byte] = chr($byte);
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -58,7 +58,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+        return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
             parent::encodeString($string, $firstLineOffset, $maxLineLength)
         );
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
deleted file mode 100644
index c65f26d72..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Creates MIME headers.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_HeaderFactory extends Swift_Mime_CharsetObserver
-{
-    /**
-     * Create a new Mailbox Header with a list of $addresses.
-     *
-     * @param string       $name
-     * @param array|string $addresses
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createMailboxHeader($name, $addresses = null);
-
-    /**
-     * Create a new Date header using $timestamp (UNIX time).
-     *
-     * @param string $name
-     * @param int    $timestamp
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createDateHeader($name, $timestamp = null);
-
-    /**
-     * Create a new basic text header with $name and $value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createTextHeader($name, $value = null);
-
-    /**
-     * Create a new ParameterizedHeader with $name, $value and $params.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $params
-     *
-     * @return Swift_Mime_ParameterizedHeader
-     */
-    public function createParameterizedHeader($name, $value = null, $params = array());
-
-    /**
-     * Create a new ID header for Message-ID or Content-ID.
-     *
-     * @param string       $name
-     * @param string|array $ids
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createIdHeader($name, $ids = null);
-
-    /**
-     * Create a new Path header with an address (path) in it.
-     *
-     * @param string $name
-     * @param string $path
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createPathHeader($name, $path = null);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
deleted file mode 100644
index 1768709e9..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A collection of MIME headers.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver
-{
-    /**
-     * Add a new Mailbox Header with a list of $addresses.
-     *
-     * @param string       $name
-     * @param array|string $addresses
-     */
-    public function addMailboxHeader($name, $addresses = null);
-
-    /**
-     * Add a new Date header using $timestamp (UNIX time).
-     *
-     * @param string $name
-     * @param int    $timestamp
-     */
-    public function addDateHeader($name, $timestamp = null);
-
-    /**
-     * Add a new basic text header with $name and $value.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function addTextHeader($name, $value = null);
-
-    /**
-     * Add a new ParameterizedHeader with $name, $value and $params.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $params
-     */
-    public function addParameterizedHeader($name, $value = null, $params = array());
-
-    /**
-     * Add a new ID header for Message-ID or Content-ID.
-     *
-     * @param string       $name
-     * @param string|array $ids
-     */
-    public function addIdHeader($name, $ids = null);
-
-    /**
-     * Add a new Path header with an address (path) in it.
-     *
-     * @param string $name
-     * @param string $path
-     */
-    public function addPathHeader($name, $path = null);
-
-    /**
-     * Returns true if at least one header with the given $name exists.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     *
-     * @param string $name
-     * @param int    $index
-     *
-     * @return bool
-     */
-    public function has($name, $index = 0);
-
-    /**
-     * Set a header in the HeaderSet.
-     *
-     * The header may be a previously fetched header via {@link get()} or it may
-     * be one that has been created separately.
-     *
-     * If $index is specified, the header will be inserted into the set at this
-     * offset.
-     *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
-     */
-    public function set(Swift_Mime_Header $header, $index = 0);
-
-    /**
-     * Get the header with the given $name.
-     * If multiple headers match, the actual one may be specified by $index.
-     * Returns NULL if none present.
-     *
-     * @param string $name
-     * @param int    $index
-     *
-     * @return Swift_Mime_Header
-     */
-    public function get($name, $index = 0);
-
-    /**
-     * Get all headers with the given $name.
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function getAll($name = null);
-
-    /**
-     * Return the name of all Headers.
-     *
-     * @return array
-     */
-    public function listAll();
-
-    /**
-     * Remove the header with the given $name if it's set.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     *
-     * @param string $name
-     * @param int    $index
-     */
-    public function remove($name, $index = 0);
-
-    /**
-     * Remove all headers with the given $name.
-     *
-     * @param string $name
-     */
-    public function removeAll($name);
-
-    /**
-     * Create a new instance of this HeaderSet.
-     *
-     * @return self
-     */
-    public function newInstance();
-
-    /**
-     * Define a list of Header names as an array in the correct order.
-     *
-     * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
-     */
-    public function defineOrdering(array $sequence);
-
-    /**
-     * Set a list of header names which must always be displayed when set.
-     *
-     * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
-     */
-    public function setAlwaysDisplayed(array $names);
-
-    /**
-     * Returns a string with a representation of all headers.
-     *
-     * @return string
-     */
-    public function toString();
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index 3a6d7b39e..25740d115 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -11,68 +11,53 @@
 /**
  * An abstract base MIME Header.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
 {
+    const PHRASE_PATTERN = '(?:(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?"((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21\x23-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*(?:(?:[ \t]*(?:\r\n))?[ \t])?"(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?))+?)';
+
     /**
      * The name of this Header.
      *
      * @var string
      */
-    private $_name;
-
-    /**
-     * The Grammar used for this Header.
-     *
-     * @var Swift_Mime_Grammar
-     */
-    private $_grammar;
+    private $name;
 
     /**
      * The Encoder used to encode this Header.
      *
      * @var Swift_Encoder
      */
-    private $_encoder;
+    private $encoder;
 
     /**
      * The maximum length of a line in the header.
      *
      * @var int
      */
-    private $_lineLength = 78;
+    private $lineLength = 78;
 
     /**
      * The language used in this Header.
      *
      * @var string
      */
-    private $_lang;
+    private $lang;
 
     /**
      * The character set of the text in this Header.
      *
      * @var string
      */
-    private $_charset = 'utf-8';
+    private $charset = 'utf-8';
 
     /**
      * The value of this Header, cached.
      *
      * @var string
      */
-    private $_cachedValue = null;
-
-    /**
-     * Creates a new Header.
-     *
-     * @param Swift_Mime_Grammar $grammar
-     */
-    public function __construct(Swift_Mime_Grammar $grammar)
-    {
-        $this->setGrammar($grammar);
-    }
+    private $cachedValue = null;
 
     /**
      * Set the character set used in this Header.
@@ -81,10 +66,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function setCharset($charset)
     {
-        $this->clearCachedValueIf($charset != $this->_charset);
-        $this->_charset = $charset;
-        if (isset($this->_encoder)) {
-            $this->_encoder->charsetChanged($charset);
+        $this->clearCachedValueIf($charset != $this->charset);
+        $this->charset = $charset;
+        if (isset($this->encoder)) {
+            $this->encoder->charsetChanged($charset);
         }
     }
 
@@ -95,7 +80,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getCharset()
     {
-        return $this->_charset;
+        return $this->charset;
     }
 
     /**
@@ -108,8 +93,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function setLanguage($lang)
     {
-        $this->clearCachedValueIf($this->_lang != $lang);
-        $this->_lang = $lang;
+        $this->clearCachedValueIf($this->lang != $lang);
+        $this->lang = $lang;
     }
 
     /**
@@ -119,17 +104,15 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getLanguage()
     {
-        return $this->_lang;
+        return $this->lang;
     }
 
     /**
      * Set the encoder used for encoding the header.
-     *
-     * @param Swift_Mime_HeaderEncoder $encoder
      */
     public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
     {
-        $this->_encoder = $encoder;
+        $this->encoder = $encoder;
         $this->setCachedValue(null);
     }
 
@@ -140,28 +123,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getEncoder()
     {
-        return $this->_encoder;
-    }
-
-    /**
-     * Set the grammar used for the header.
-     *
-     * @param Swift_Mime_Grammar $grammar
-     */
-    public function setGrammar(Swift_Mime_Grammar $grammar)
-    {
-        $this->_grammar = $grammar;
-        $this->setCachedValue(null);
-    }
-
-    /**
-     * Get the grammar used for this Header.
-     *
-     * @return Swift_Mime_Grammar
-     */
-    public function getGrammar()
-    {
-        return $this->_grammar;
+        return $this->encoder;
     }
 
     /**
@@ -171,7 +133,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getFieldName()
     {
-        return $this->_name;
+        return $this->name;
     }
 
     /**
@@ -181,8 +143,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function setMaxLineLength($lineLength)
     {
-        $this->clearCachedValueIf($this->_lineLength != $lineLength);
-        $this->_lineLength = $lineLength;
+        $this->clearCachedValueIf($this->lineLength != $lineLength);
+        $this->lineLength = $lineLength;
     }
 
     /**
@@ -192,19 +154,19 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getMaxLineLength()
     {
-        return $this->_lineLength;
+        return $this->lineLength;
     }
 
     /**
      * Get this Header rendered as a RFC 2822 compliant string.
      *
-     * @throws Swift_RfcComplianceException
-     *
      * @return string
+     *
+     * @throws Swift_RfcComplianceException
      */
     public function toString()
     {
-        return $this->_tokensToString($this->toTokens());
+        return $this->tokensToString($this->toTokens());
     }
 
     /**
@@ -226,17 +188,15 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function setFieldName($name)
     {
-        $this->_name = $name;
+        $this->name = $name;
     }
 
     /**
      * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
      *
-     * @param Swift_Mime_Header        $header
-     * @param string                   $string  as displayed
-     * @param string                   $charset of the text
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param bool                     $shorten the first line to make remove for header name
+     * @param string $string  as displayed
+     * @param string $charset of the text
+     * @param bool   $shorten the first line to make remove for header name
      *
      * @return string
      */
@@ -245,19 +205,18 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         // Treat token as exactly what was given
         $phraseStr = $string;
         // If it's not valid
-        if (!preg_match('/^'.$this->getGrammar()->getDefinition('phrase').'$/D', $phraseStr)) {
+
+        if (!preg_match('/^'.self::PHRASE_PATTERN.'$/D', $phraseStr)) {
             // .. but it is just ascii text, try escaping some characters
             // and make it a quoted-string
-            if (preg_match('/^'.$this->getGrammar()->getDefinition('text').'*$/D', $phraseStr)) {
-                $phraseStr = $this->getGrammar()->escapeSpecials(
-                    $phraseStr, array('"'), $this->getGrammar()->getSpecials()
-                    );
+            if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
+                $phraseStr = $this->escapeSpecials($phraseStr, ['"']);
                 $phraseStr = '"'.$phraseStr.'"';
             } else {
                 // ... otherwise it needs encoding
                 // Determine space remaining on line if first line
                 if ($shorten) {
-                    $usedLength = strlen($header->getFieldName().': ');
+                    $usedLength = \strlen($header->getFieldName().': ');
                 } else {
                     $usedLength = 0;
                 }
@@ -268,12 +227,28 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         return $phraseStr;
     }
 
+    /**
+     * Escape special characters in a string (convert to quoted-pairs).
+     *
+     * @param string   $token
+     * @param string[] $include additional chars to escape
+     *
+     * @return string
+     */
+    private function escapeSpecials($token, $include = [])
+    {
+        foreach (array_merge(['\\'], $include) as $char) {
+            $token = str_replace($char, '\\'.$char, $token);
+        }
+
+        return $token;
+    }
+
     /**
      * Encode needed word tokens within a string of input.
      *
-     * @param Swift_Mime_Header $header
-     * @param string            $input
-     * @param string            $usedLength optional
+     * @param string $input
+     * @param string $usedLength optional
      *
      * @return string
      */
@@ -296,7 +271,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
                 }
 
                 if (-1 == $usedLength) {
-                    $usedLength = strlen($header->getFieldName().': ') + strlen($value);
+                    $usedLength = \strlen($header->getFieldName().': ') + \strlen($value);
                 }
                 $value .= $this->getTokenAsEncodedWord($token, $usedLength);
 
@@ -330,22 +305,22 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getEncodableWordTokens($string)
     {
-        $tokens = array();
+        $tokens = [];
 
         $encodedToken = '';
         // Split at all whitespace boundaries
-        foreach (preg_split('~(?=[\t ])~', $string) as $token) {
+        foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
             if ($this->tokenNeedsEncoding($token)) {
                 $encodedToken .= $token;
             } else {
-                if (strlen($encodedToken) > 0) {
+                if (\strlen($encodedToken) > 0) {
                     $tokens[] = $encodedToken;
                     $encodedToken = '';
                 }
                 $tokens[] = $token;
             }
         }
-        if (strlen($encodedToken)) {
+        if (\strlen($encodedToken)) {
             $tokens[] = $encodedToken;
         }
 
@@ -363,12 +338,12 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
     {
         // Adjust $firstLineOffset to account for space needed for syntax
-        $charsetDecl = $this->_charset;
-        if (isset($this->_lang)) {
-            $charsetDecl .= '*'.$this->_lang;
+        $charsetDecl = $this->charset;
+        if (isset($this->lang)) {
+            $charsetDecl .= '*'.$this->lang;
         }
-        $encodingWrapperLength = strlen(
-            '=?'.$charsetDecl.'?'.$this->_encoder->getName().'??='
+        $encodingWrapperLength = \strlen(
+            '=?'.$charsetDecl.'?'.$this->encoder->getName().'??='
             );
 
         if ($firstLineOffset >= 75) {
@@ -377,16 +352,16 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         }
 
         $encodedTextLines = explode("\r\n",
-            $this->_encoder->encodeString(
-                $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->_charset
-                )
+            $this->encoder->encodeString(
+                $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
+            ) ?? ''
         );
 
-        if (strtolower($this->_charset) !== 'iso-2022-jp') {
+        if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
             // special encoding for iso-2022-jp using mb_encode_mimeheader
             foreach ($encodedTextLines as $lineNum => $line) {
                 $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
-                    '?'.$this->_encoder->getName().
+                    '?'.$this->encoder->getName().
                     '?'.$line.'?=';
             }
         }
@@ -403,7 +378,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function generateTokenLines($token)
     {
-        return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+        return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
     }
 
     /**
@@ -413,7 +388,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function setCachedValue($value)
     {
-        $this->_cachedValue = $value;
+        $this->cachedValue = $value;
     }
 
     /**
@@ -423,7 +398,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getCachedValue()
     {
-        return $this->_cachedValue;
+        return $this->cachedValue;
     }
 
     /**
@@ -451,10 +426,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             $string = $this->getFieldBody();
         }
 
-        $tokens = array();
+        $tokens = [];
 
         // Generate atoms; split at all invisible boundaries followed by WSP
-        foreach (preg_split('~(?=[ \t])~', $string) as $token) {
+        foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
             $newTokens = $this->generateTokenLines($token);
             foreach ($newTokens as $newToken) {
                 $tokens[] = $newToken;
@@ -472,19 +447,19 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      *
      * @return string
      */
-    private function _tokensToString(array $tokens)
+    private function tokensToString(array $tokens)
     {
         $lineCount = 0;
-        $headerLines = array();
-        $headerLines[] = $this->_name.': ';
+        $headerLines = [];
+        $headerLines[] = $this->name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
         // Build all tokens back into compliant header
         foreach ($tokens as $i => $token) {
             // Line longer than specified maximum or token was just a new line
             if (("\r\n" == $token) ||
-                ($i > 0 && strlen($currentLine.$token) > $this->_lineLength)
-                && 0 < strlen($currentLine)) {
+                ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
+                && 0 < \strlen($currentLine)) {
                 $headerLines[] = '';
                 $currentLine = &$headerLines[$lineCount++];
             }
@@ -498,4 +473,14 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         // Implode with FWS (RFC 2822, 2.2.3)
         return implode("\r\n", $headerLines)."\r\n";
     }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        if ($this->encoder) {
+            $this->encoder = clone $this->encoder;
+        }
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 4075cbfa1..efe1dad66 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -16,29 +16,20 @@
 class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
 {
     /**
-     * The UNIX timestamp value of this Header.
+     * Date-time value of this Header.
      *
-     * @var int
+     * @var DateTimeImmutable
      */
-    private $_timestamp;
+    private $dateTime;
 
     /**
-     * Creates a new DateHeader with $name and $timestamp.
+     * Creates a new DateHeader with $name.
      *
-     * Example:
-     * <code>
-     * <?php
-     * $header = new Swift_Mime_Headers_DateHeader('Date', time());
-     * ?>
-     * </code>
-     *
-     * @param string             $name    of Header
-     * @param Swift_Mime_Grammar $grammar
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_Grammar $grammar)
+    public function __construct($name)
     {
         $this->setFieldName($name);
-        parent::__construct($grammar);
     }
 
     /**
@@ -57,49 +48,46 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
     /**
      * Set the model for the field body.
      *
-     * This method takes a UNIX timestamp.
-     *
-     * @param int $model
+     * @param DateTimeInterface $model
      */
     public function setFieldBodyModel($model)
     {
-        $this->setTimestamp($model);
+        $this->setDateTime($model);
     }
 
     /**
      * Get the model for the field body.
      *
-     * This method returns a UNIX timestamp.
-     *
-     * @return mixed
+     * @return DateTimeImmutable
      */
     public function getFieldBodyModel()
     {
-        return $this->getTimestamp();
+        return $this->getDateTime();
     }
 
     /**
-     * Get the UNIX timestamp of the Date in this Header.
+     * Get the date-time representing the Date in this Header.
      *
-     * @return int
+     * @return DateTimeImmutable
      */
-    public function getTimestamp()
+    public function getDateTime()
     {
-        return $this->_timestamp;
+        return $this->dateTime;
     }
 
     /**
-     * Set the UNIX timestamp of the Date in this Header.
+     * Set the date-time of the Date in this Header.
      *
-     * @param int $timestamp
+     * If a DateTime instance is provided, it is converted to DateTimeImmutable.
      */
-    public function setTimestamp($timestamp)
+    public function setDateTime(DateTimeInterface $dateTime)
     {
-        if (null !== $timestamp) {
-            $timestamp = (int) $timestamp;
+        $this->clearCachedValueIf($this->getCachedValue() != $dateTime->format(DateTime::RFC2822));
+        if ($dateTime instanceof DateTime) {
+            $immutable = new DateTimeImmutable('@'.$dateTime->getTimestamp());
+            $dateTime = $immutable->setTimezone($dateTime->getTimezone());
         }
-        $this->clearCachedValueIf($this->_timestamp != $timestamp);
-        $this->_timestamp = $timestamp;
+        $this->dateTime = $dateTime;
     }
 
     /**
@@ -115,8 +103,8 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            if (isset($this->_timestamp)) {
-                $this->setCachedValue(date('r', $this->_timestamp));
+            if (isset($this->dateTime)) {
+                $this->setCachedValue($this->dateTime->format(DateTime::RFC2822));
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
index b114506b4..4fcdff418 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -8,6 +8,10 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\MessageIDValidation;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 /**
  * An ID MIME Header for something like Message-ID or Content-ID.
  *
@@ -22,18 +26,27 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @var string[]
      */
-    private $_ids = array();
+    private $ids = [];
+
+    /**
+     * The strict EmailValidator.
+     *
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
+    private $addressEncoder;
 
     /**
      * Creates a new IdentificationHeader with the given $name and $id.
      *
-     * @param string             $name
-     * @param Swift_Mime_Grammar $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_Grammar $grammar)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
-        parent::__construct($grammar);
+        $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -84,7 +97,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setId($id)
     {
-        $this->setIds(is_array($id) ? $id : array($id));
+        $this->setIds(\is_array($id) ? $id : [$id]);
     }
 
     /**
@@ -96,8 +109,8 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function getId()
     {
-        if (count($this->_ids) > 0) {
-            return $this->_ids[0];
+        if (\count($this->ids) > 0) {
+            return $this->ids[0];
         }
     }
 
@@ -110,15 +123,15 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setIds(array $ids)
     {
-        $actualIds = array();
+        $actualIds = [];
 
         foreach ($ids as $id) {
-            $this->_assertValidId($id);
+            $this->assertValidId($id);
             $actualIds[] = $id;
         }
 
-        $this->clearCachedValueIf($this->_ids != $actualIds);
-        $this->_ids = $actualIds;
+        $this->clearCachedValueIf($this->ids != $actualIds);
+        $this->ids = $actualIds;
     }
 
     /**
@@ -128,7 +141,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function getIds()
     {
-        return $this->_ids;
+        return $this->ids;
     }
 
     /**
@@ -146,10 +159,10 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            $angleAddrs = array();
+            $angleAddrs = [];
 
-            foreach ($this->_ids as $id) {
-                $angleAddrs[] = '<'.$id.'>';
+            foreach ($this->ids as $id) {
+                $angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
             }
 
             $this->setCachedValue(implode(' ', $angleAddrs));
@@ -165,16 +178,12 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @throws Swift_RfcComplianceException
      */
-    private function _assertValidId($id)
+    private function assertValidId($id)
     {
-        if (!preg_match(
-            '/^'.$this->getGrammar()->getDefinition('id-left').'@'.
-            $this->getGrammar()->getDefinition('id-right').'$/D',
-            $id
-            )) {
-            throw new Swift_RfcComplianceException(
-                'Invalid ID given <'.$id.'>'
-                );
+        $emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
+
+        if (!$this->emailValidator->isValid($id, $emailValidation)) {
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index e4567fc80..ddd5e8cff 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -8,6 +8,9 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 /**
  * A Mailbox Address MIME Header for something like From or Sender.
  *
@@ -20,20 +23,28 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string[]
      */
-    private $_mailboxes = array();
+    private $mailboxes = [];
+
+    /**
+     * The strict EmailValidator.
+     *
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
+    private $addressEncoder;
 
     /**
      * Creates a new MailboxHeader with $name.
      *
-     * @param string                   $name    of Header
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Mime_Grammar $grammar)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
-        parent::__construct($grammar);
+        $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -103,7 +114,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function setNameAddresses($mailboxes)
     {
-        $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
+        $this->mailboxes = $this->normalizeMailboxes((array) $mailboxes);
         $this->setCachedValue(null); //Clear any cached value
     }
 
@@ -134,7 +145,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getNameAddressStrings()
     {
-        return $this->_createNameAddressStrings($this->getNameAddresses());
+        return $this->createNameAddressStrings($this->getNameAddresses());
     }
 
     /**
@@ -163,7 +174,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getNameAddresses()
     {
-        return $this->_mailboxes;
+        return $this->mailboxes;
     }
 
     /**
@@ -200,7 +211,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getAddresses()
     {
-        return array_keys($this->_mailboxes);
+        return array_keys($this->mailboxes);
     }
 
     /**
@@ -212,7 +223,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
     {
         $this->setCachedValue(null);
         foreach ((array) $addresses as $address) {
-            unset($this->_mailboxes[$address]);
+            unset($this->mailboxes[$address]);
         }
     }
 
@@ -232,7 +243,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
     {
         // Compute the string value of the header only if needed
         if (null === $this->getCachedValue()) {
-            $this->setCachedValue($this->createMailboxListString($this->_mailboxes));
+            $this->setCachedValue($this->createMailboxListString($this->mailboxes));
         }
 
         return $this->getCachedValue();
@@ -247,10 +258,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function normalizeMailboxes(array $mailboxes)
     {
-        $actualMailboxes = array();
+        $actualMailboxes = [];
 
         foreach ($mailboxes as $key => $value) {
-            if (is_string($key)) {
+            if (\is_string($key)) {
                 //key is email addr
                 $address = $key;
                 $name = $value;
@@ -258,7 +269,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
                 $address = $value;
                 $name = null;
             }
-            $this->_assertValidAddress($address);
+            $this->assertValidAddress($address);
             $actualMailboxes[$address] = $name;
         }
 
@@ -289,7 +300,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function createMailboxListString(array $mailboxes)
     {
-        return implode(', ', $this->_createNameAddressStrings($mailboxes));
+        return implode(', ', $this->createNameAddressStrings($mailboxes));
     }
 
     /**
@@ -315,12 +326,12 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @return string[]
      */
-    private function _createNameAddressStrings(array $mailboxes)
+    private function createNameAddressStrings(array $mailboxes)
     {
-        $strings = array();
+        $strings = [];
 
         foreach ($mailboxes as $email => $name) {
-            $mailboxStr = $email;
+            $mailboxStr = $this->addressEncoder->encodeString($email);
             if (null !== $name) {
                 $nameStr = $this->createDisplayNameString($name, empty($strings));
                 $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
@@ -336,16 +347,12 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @param string $address
      *
-     * @throws Swift_RfcComplianceException If invalid.
+     * @throws Swift_RfcComplianceException if invalid
      */
-    private function _assertValidAddress($address)
+    private function assertValidAddress($address)
     {
-        if (!preg_match('/^'.$this->getGrammar()->getDefinition('addr-spec').'$/D',
-            $address)) {
-            throw new Swift_RfcComplianceException(
-                'Address in mailbox given ['.$address.
-                '] does not comply with RFC 2822, 3.6.2.'
-                );
+        if (!$this->emailValidator->isValid($address, new RFCValidation())) {
+            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
index d74955007..fafb5bae2 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -12,6 +12,8 @@
  * An OpenDKIM Specific Header using only raw header datas without encoding.
  *
  * @author De Cock Xavier <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
 {
@@ -20,21 +22,21 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      *
      * @var string
      */
-    private $_value;
+    private $value;
 
     /**
      * The name of this Header.
      *
      * @var string
      */
-    private $_fieldName;
+    private $fieldName;
 
     /**
      * @param string $name
      */
     public function __construct($name)
     {
-        $this->_fieldName = $name;
+        $this->fieldName = $name;
     }
 
     /**
@@ -81,7 +83,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function getValue()
     {
-        return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -91,7 +93,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function setValue($value)
     {
-        $this->_value = $value;
+        $this->value = $value;
     }
 
     /**
@@ -101,7 +103,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function getFieldBody()
     {
-        return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -111,7 +113,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function toString()
     {
-        return $this->_fieldName.': '.$this->_value;
+        return $this->fieldName.': '.$this->value."\r\n";
     }
 
     /**
@@ -121,7 +123,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function getFieldName()
     {
-        return $this->_fieldName;
+        return $this->fieldName;
     }
 
     /**
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index c1777d333..47c15e6c0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -13,7 +13,7 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader implements Swift_Mime_ParameterizedHeader
+class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader
 {
     /**
      * RFC 2231's definition of a token.
@@ -27,27 +27,24 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @var Swift_Encoder
      */
-    private $_paramEncoder;
+    private $paramEncoder;
 
     /**
      * The parameters as an associative array.
      *
      * @var string[]
      */
-    private $_params = array();
+    private $params = [];
 
     /**
      * Creates a new ParameterizedHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder, optional
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null, Swift_Mime_Grammar $grammar)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
     {
-        parent::__construct($name, $encoder, $grammar);
-        $this->_paramEncoder = $paramEncoder;
+        parent::__construct($name, $encoder);
+        $this->paramEncoder = $paramEncoder;
     }
 
     /**
@@ -71,8 +68,8 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     public function setCharset($charset)
     {
         parent::setCharset($charset);
-        if (isset($this->_paramEncoder)) {
-            $this->_paramEncoder->charsetChanged($charset);
+        if (isset($this->paramEncoder)) {
+            $this->paramEncoder->charsetChanged($charset);
         }
     }
 
@@ -84,7 +81,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameter($parameter, $value)
     {
-        $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+        $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
     }
 
     /**
@@ -98,7 +95,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     {
         $params = $this->getParameters();
 
-        return array_key_exists($parameter, $params) ? $params[$parameter] : null;
+        return $params[$parameter] ?? null;
     }
 
     /**
@@ -108,8 +105,8 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameters(array $parameters)
     {
-        $this->clearCachedValueIf($this->_params != $parameters);
-        $this->_params = $parameters;
+        $this->clearCachedValueIf($this->params != $parameters);
+        $this->params = $parameters;
     }
 
     /**
@@ -119,7 +116,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function getParameters()
     {
-        return $this->_params;
+        return $this->params;
     }
 
     /**
@@ -130,10 +127,10 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     public function getFieldBody() //TODO: Check caching here
     {
         $body = parent::getFieldBody();
-        foreach ($this->_params as $name => $value) {
+        foreach ($this->params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; '.$this->_createParameter($name, $value);
+                $body .= '; '.$this->createParameter($name, $value);
             }
         }
 
@@ -155,12 +152,12 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
         $tokens = parent::toTokens(parent::getFieldBody());
 
         // Try creating any parameters
-        foreach ($this->_params as $name => $value) {
+        foreach ($this->params as $name => $value) {
             if (null !== $value) {
                 // Add the semi-colon separator
-                $tokens[count($tokens) - 1] .= ';';
+                $tokens[\count($tokens) - 1] .= ';';
                 $tokens = array_merge($tokens, $this->generateTokenLines(
-                    ' '.$this->_createParameter($name, $value)
+                    ' '.$this->createParameter($name, $value)
                     ));
             }
         }
@@ -176,33 +173,33 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @return string
      */
-    private function _createParameter($name, $value)
+    private function createParameter($name, $value)
     {
         $origValue = $value;
 
         $encoded = false;
         // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
+        $maxValueLength = $this->getMaxLineLength() - \strlen($name.'=*N"";') - 1;
         $firstLineOffset = 0;
 
         // If it's not already a valid parameter value...
         if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             // TODO: text, or something else??
             // ... and it's not ascii
-            if (!preg_match('/^'.$this->getGrammar()->getDefinition('text').'*$/D', $value)) {
+            if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $encoded = true;
                 // Allow space for the indices, charset and language
-                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
-                $firstLineOffset = strlen(
+                $maxValueLength = $this->getMaxLineLength() - \strlen($name.'*N*="";') - 1;
+                $firstLineOffset = \strlen(
                     $this->getCharset()."'".$this->getLanguage()."'"
                     );
             }
         }
 
         // Encode if we need to
-        if ($encoded || strlen($value) > $maxValueLength) {
-            if (isset($this->_paramEncoder)) {
-                $value = $this->_paramEncoder->encodeString(
+        if ($encoded || \strlen($value) > $maxValueLength) {
+            if (isset($this->paramEncoder)) {
+                $value = $this->paramEncoder->encodeString(
                     $origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
                     );
             } else {
@@ -212,19 +209,19 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             }
         }
 
-        $valueLines = isset($this->_paramEncoder) ? explode("\r\n", $value) : array($value);
+        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
 
         // Need to add indices
-        if (count($valueLines) > 1) {
-            $paramLines = array();
+        if (\count($valueLines) > 1) {
+            $paramLines = [];
             foreach ($valueLines as $i => $line) {
                 $paramLines[] = $name.'*'.$i.
-                    $this->_getEndOfParameterValue($line, true, $i == 0);
+                    $this->getEndOfParameterValue($line, true, 0 == $i);
             }
 
             return implode(";\r\n ", $paramLines);
         } else {
-            return $name.$this->_getEndOfParameterValue(
+            return $name.$this->getEndOfParameterValue(
                 $valueLines[0], $encoded, true
                 );
         }
@@ -239,7 +236,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @return string
      */
-    private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
+    private function getEndOfParameterValue($value, $encoded = false, $firstLine = false)
     {
         if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             $value = '"'.$value.'"';
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index 4a814b122..81b421ee7 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -8,6 +8,9 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 /**
  * A Path Header in Swift Mailer, such a Return-Path.
  *
@@ -20,18 +23,27 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string
      */
-    private $_address;
+    private $address;
+
+    /**
+     * The strict EmailValidator.
+     *
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
+    private $addressEncoder;
 
     /**
      * Creates a new PathHeader with the given $name.
      *
-     * @param string             $name
-     * @param Swift_Mime_Grammar $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_Grammar $grammar)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
-        parent::__construct($grammar);
+        $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -81,12 +93,12 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     public function setAddress($address)
     {
         if (null === $address) {
-            $this->_address = null;
+            $this->address = null;
         } elseif ('' == $address) {
-            $this->_address = '';
+            $this->address = '';
         } else {
-            $this->_assertValidAddress($address);
-            $this->_address = $address;
+            $this->assertValidAddress($address);
+            $this->address = $address;
         }
         $this->setCachedValue(null);
     }
@@ -100,7 +112,7 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getAddress()
     {
-        return $this->_address;
+        return $this->address;
     }
 
     /**
@@ -116,8 +128,9 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            if (isset($this->_address)) {
-                $this->setCachedValue('<'.$this->_address.'>');
+            if (isset($this->address)) {
+                $address = $this->addressEncoder->encodeString($this->address);
+                $this->setCachedValue('<'.$address.'>');
             }
         }
 
@@ -131,13 +144,10 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @throws Swift_RfcComplianceException If address is invalid
      */
-    private function _assertValidAddress($address)
+    private function assertValidAddress($address)
     {
-        if (!preg_match('/^'.$this->getGrammar()->getDefinition('addr-spec').'$/D',
-            $address)) {
-            throw new Swift_RfcComplianceException(
-                'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
-                );
+        if (!$this->emailValidator->isValid($address, new RFCValidation())) {
+            throw new Swift_RfcComplianceException('Address set in PathHeader does not comply with addr-spec of RFC 2822.');
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
index 86177f14a..64f160dec 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -20,20 +20,17 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
      *
      * @var string
      */
-    private $_value;
+    private $value;
 
     /**
      * Creates a new SimpleHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Mime_Grammar $grammar)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
-        parent::__construct($grammar);
     }
 
     /**
@@ -80,7 +77,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
      */
     public function getValue()
     {
-        return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -90,8 +87,8 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
      */
     public function setValue($value)
     {
-        $this->clearCachedValueIf($this->_value != $value);
-        $this->_value = $value;
+        $this->clearCachedValueIf($this->value != $value);
+        $this->value = $value;
     }
 
     /**
@@ -103,7 +100,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
     {
         if (!$this->getCachedValue()) {
             $this->setCachedValue(
-                $this->encodeWords($this, $this->_value)
+                $this->encodeWords($this, $this->value)
                 );
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
new file mode 100644
index 000000000..3ce35f27c
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Message ID generator.
+ */
+class Swift_Mime_IdGenerator implements Swift_IdGenerator
+{
+    private $idRight;
+
+    /**
+     * @param string $idRight
+     */
+    public function __construct($idRight)
+    {
+        $this->idRight = $idRight;
+    }
+
+    /**
+     * Returns the right-hand side of the "@" used in all generated IDs.
+     *
+     * @return string
+     */
+    public function getIdRight()
+    {
+        return $this->idRight;
+    }
+
+    /**
+     * Sets the right-hand side of the "@" to use in all generated IDs.
+     *
+     * @param string $idRight
+     */
+    public function setIdRight($idRight)
+    {
+        $this->idRight = $idRight;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateId()
+    {
+        // 32 hex values for the left part
+        return bin2hex(random_bytes(16)).'@'.$this->idRight;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
deleted file mode 100644
index 9b36d2162..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A Message (RFC 2822) object.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_Message extends Swift_Mime_MimeEntity
-{
-    /**
-     * Generates a valid Message-ID and switches to it.
-     *
-     * @return string
-     */
-    public function generateId();
-
-    /**
-     * Set the subject of the message.
-     *
-     * @param string $subject
-     */
-    public function setSubject($subject);
-
-    /**
-     * Get the subject of the message.
-     *
-     * @return string
-     */
-    public function getSubject();
-
-    /**
-     * Set the origination date of the message as a UNIX timestamp.
-     *
-     * @param int $date
-     */
-    public function setDate($date);
-
-    /**
-     * Get the origination date of the message as a UNIX timestamp.
-     *
-     * @return int
-     */
-    public function getDate();
-
-    /**
-     * Set the return-path (bounce-detect) address.
-     *
-     * @param string $address
-     */
-    public function setReturnPath($address);
-
-    /**
-     * Get the return-path (bounce-detect) address.
-     *
-     * @return string
-     */
-    public function getReturnPath();
-
-    /**
-     * Set the sender of this message.
-     *
-     * If multiple addresses are present in the From field, this SHOULD be set.
-     *
-     * According to RFC 2822 it is a requirement when there are multiple From
-     * addresses, but Swift itself does not require it directly.
-     *
-     * An associative array (with one element!) can be used to provide a display-
-     * name: i.e. array('email@address' => 'Real Name').
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $address
-     * @param string $name    optional
-     */
-    public function setSender($address, $name = null);
-
-    /**
-     * Get the sender address for this message.
-     *
-     * This has a higher significance than the From address.
-     *
-     * @return string
-     */
-    public function getSender();
-
-    /**
-     * Set the From address of this message.
-     *
-     * It is permissible for multiple From addresses to be set using an array.
-     *
-     * If multiple From addresses are used, you SHOULD set the Sender address and
-     * according to RFC 2822, MUST set the sender address.
-     *
-     * An array can be used if display names are to be provided: i.e.
-     * array('email@address.com' => 'Real Name').
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setFrom($addresses, $name = null);
-
-    /**
-     * Get the From address(es) of this message.
-     *
-     * This method always returns an associative array where the keys are the
-     * addresses.
-     *
-     * @return string[]
-     */
-    public function getFrom();
-
-    /**
-     * Set the Reply-To address(es).
-     *
-     * Any replies from the receiver will be sent to this address.
-     *
-     * It is permissible for multiple reply-to addresses to be set using an array.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setReplyTo($addresses, $name = null);
-
-    /**
-     * Get the Reply-To addresses for this message.
-     *
-     * This method always returns an associative array where the keys provide the
-     * email addresses.
-     *
-     * @return string[]
-     */
-    public function getReplyTo();
-
-    /**
-     * Set the To address(es).
-     *
-     * Recipients set in this field will receive a copy of this message.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setCc()}.
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setTo($addresses, $name = null);
-
-    /**
-     * Get the To addresses for this message.
-     *
-     * This method always returns an associative array, whereby the keys provide
-     * the actual email addresses.
-     *
-     * @return string[]
-     */
-    public function getTo();
-
-    /**
-     * Set the Cc address(es).
-     *
-     * Recipients set in this field will receive a 'carbon-copy' of this message.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setCc($addresses, $name = null);
-
-    /**
-     * Get the Cc addresses for this message.
-     *
-     * This method always returns an associative array, whereby the keys provide
-     * the actual email addresses.
-     *
-     * @return string[]
-     */
-    public function getCc();
-
-    /**
-     * Set the Bcc address(es).
-     *
-     * Recipients set in this field will receive a 'blind-carbon-copy' of this
-     * message.
-     *
-     * In other words, they will get the message, but any other recipients of the
-     * message will have no such knowledge of their receipt of it.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setBcc($addresses, $name = null);
-
-    /**
-     * Get the Bcc addresses for this message.
-     *
-     * This method always returns an associative array, whereby the keys provide
-     * the actual email addresses.
-     *
-     * @return string[]
-     */
-    public function getBcc();
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
deleted file mode 100644
index 30f460cdc..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A MIME entity, such as an attachment.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_MimeEntity extends Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
-{
-    /** Main message document; there can only be one of these */
-    const LEVEL_TOP = 16;
-
-    /** An entity which nests with the same precedence as an attachment */
-    const LEVEL_MIXED = 256;
-
-    /** An entity which nests with the same precedence as a mime part */
-    const LEVEL_ALTERNATIVE = 4096;
-
-    /** An entity which nests with the same precedence as embedded content */
-    const LEVEL_RELATED = 65536;
-
-    /**
-     * Get the level at which this entity shall be nested in final document.
-     *
-     * The lower the value, the more outermost the entity will be nested.
-     *
-     * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
-     *
-     * @return int
-     */
-    public function getNestingLevel();
-
-    /**
-     * Get the qualified content-type of this mime entity.
-     *
-     * @return string
-     */
-    public function getContentType();
-
-    /**
-     * Returns a unique ID for this entity.
-     *
-     * For most entities this will likely be the Content-ID, though it has
-     * no explicit semantic meaning and can be considered an identifier for
-     * programming logic purposes.
-     *
-     * If a Content-ID header is present, this value SHOULD match the value of
-     * the header.
-     *
-     * @return string
-     */
-    public function getId();
-
-    /**
-     * Get all children nested inside this entity.
-     *
-     * These are not just the immediate children, but all children.
-     *
-     * @return Swift_Mime_MimeEntity[]
-     */
-    public function getChildren();
-
-    /**
-     * Set all children nested inside this entity.
-     *
-     * This includes grandchildren.
-     *
-     * @param Swift_Mime_MimeEntity[] $children
-     */
-    public function setChildren(array $children);
-
-    /**
-     * Get the collection of Headers in this Mime entity.
-     *
-     * @return Swift_Mime_HeaderSet
-     */
-    public function getHeaders();
-
-    /**
-     * Get the body content of this entity as a string.
-     *
-     * Returns NULL if no body has been set.
-     *
-     * @return string|null
-     */
-    public function getBody();
-
-    /**
-     * Set the body content of this entity as a string.
-     *
-     * @param string $body
-     * @param string $contentType optional
-     */
-    public function setBody($body, $contentType = null);
-
-    /**
-     * Get this entire entity in its string form.
-     *
-     * @return string
-     */
-    public function toString();
-
-    /**
-     * Get this entire entity as a ByteStream.
-     *
-     * @param Swift_InputByteStream $is to write to
-     */
-    public function toByteStream(Swift_InputByteStream $is);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index 4564fef6f..d0b2e6586 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -16,29 +16,25 @@
 class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
 {
     /** The format parameter last specified by the user */
-    protected $_userFormat;
+    protected $userFormat;
 
     /** The charset last specified by the user */
-    protected $_userCharset;
+    protected $userCharset;
 
     /** The delsp parameter last specified by the user */
-    protected $_userDelSp;
+    protected $userDelSp;
 
     /** The nesting level of this MimePart */
-    private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+    private $nestingLevel = self::LEVEL_ALTERNATIVE;
 
     /**
      * Create a new MimePart with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param string                    $charset
+     * @param string $charset
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $charset = null)
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
-        parent::__construct($headers, $encoder, $cache, $grammar);
+        parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setContentType('text/plain');
         if (null !== $charset) {
             $this->setCharset($charset);
@@ -60,7 +56,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
         if (isset($charset)) {
             $this->setCharset($charset);
         }
-        $body = $this->_convertString($body);
+        $body = $this->convertString($body);
 
         parent::setBody($body, $contentType);
 
@@ -74,7 +70,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getCharset()
     {
-        return $this->_getHeaderParameter('Content-Type', 'charset');
+        return $this->getHeaderParameter('Content-Type', 'charset');
     }
 
     /**
@@ -86,11 +82,11 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function setCharset($charset)
     {
-        $this->_setHeaderParameter('Content-Type', 'charset', $charset);
-        if ($charset !== $this->_userCharset) {
-            $this->_clearCache();
+        $this->setHeaderParameter('Content-Type', 'charset', $charset);
+        if ($charset !== $this->userCharset) {
+            $this->clearCache();
         }
-        $this->_userCharset = $charset;
+        $this->userCharset = $charset;
         parent::charsetChanged($charset);
 
         return $this;
@@ -103,7 +99,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getFormat()
     {
-        return $this->_getHeaderParameter('Content-Type', 'format');
+        return $this->getHeaderParameter('Content-Type', 'format');
     }
 
     /**
@@ -115,8 +111,8 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function setFormat($format)
     {
-        $this->_setHeaderParameter('Content-Type', 'format', $format);
-        $this->_userFormat = $format;
+        $this->setHeaderParameter('Content-Type', 'format', $format);
+        $this->userFormat = $format;
 
         return $this;
     }
@@ -128,7 +124,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getDelSp()
     {
-        return 'yes' == $this->_getHeaderParameter('Content-Type', 'delsp') ? true : false;
+        return 'yes' === $this->getHeaderParameter('Content-Type', 'delsp');
     }
 
     /**
@@ -140,8 +136,8 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function setDelSp($delsp = true)
     {
-        $this->_setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
-        $this->_userDelSp = $delsp;
+        $this->setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
+        $this->userDelSp = $delsp;
 
         return $this;
     }
@@ -155,7 +151,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getNestingLevel()
     {
-        return $this->_nestingLevel;
+        return $this->nestingLevel;
     }
 
     /**
@@ -170,41 +166,32 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     }
 
     /** Fix the content-type and encoding of this entity */
-    protected function _fixHeaders()
+    protected function fixHeaders()
     {
-        parent::_fixHeaders();
-        if (count($this->getChildren())) {
-            $this->_setHeaderParameter('Content-Type', 'charset', null);
-            $this->_setHeaderParameter('Content-Type', 'format', null);
-            $this->_setHeaderParameter('Content-Type', 'delsp', null);
+        parent::fixHeaders();
+        if (\count($this->getChildren())) {
+            $this->setHeaderParameter('Content-Type', 'charset', null);
+            $this->setHeaderParameter('Content-Type', 'format', null);
+            $this->setHeaderParameter('Content-Type', 'delsp', null);
         } else {
-            $this->setCharset($this->_userCharset);
-            $this->setFormat($this->_userFormat);
-            $this->setDelSp($this->_userDelSp);
+            $this->setCharset($this->userCharset);
+            $this->setFormat($this->userFormat);
+            $this->setDelSp($this->userDelSp);
         }
     }
 
     /** Set the nesting level of this entity */
-    protected function _setNestingLevel($level)
+    protected function setNestingLevel($level)
     {
-        $this->_nestingLevel = $level;
+        $this->nestingLevel = $level;
     }
 
     /** Encode charset when charset is not utf-8 */
-    protected function _convertString($string)
+    protected function convertString($string)
     {
-        $charset = strtolower($this->getCharset());
-        if (!in_array($charset, array('utf-8', 'iso-8859-1', 'iso-8859-15', ''))) {
-            // mb_convert_encoding must be the first one to check, since iconv cannot convert some words.
-            if (function_exists('mb_convert_encoding')) {
-                $string = mb_convert_encoding($string, $charset, 'utf-8');
-            } elseif (function_exists('iconv')) {
-                $string = iconv('utf-8//TRANSLIT//IGNORE', $charset, $string);
-            } else {
-                throw new Swift_SwiftException('No suitable convert encoding function (use UTF-8 as your charset or install the mbstring or iconv extension).');
-            }
-
-            return $string;
+        $charset = strtolower($this->getCharset() ?? '');
+        if (!\in_array($charset, ['utf-8', 'iso-8859-1', 'iso-8859-15', ''])) {
+            return mb_convert_encoding($string, $charset, 'utf-8');
         }
 
         return $string;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
deleted file mode 100644
index e15c6ef95..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A MIME Header with parameters.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_ParameterizedHeader extends Swift_Mime_Header
-{
-    /**
-     * Set the value of $parameter.
-     *
-     * @param string $parameter
-     * @param string $value
-     */
-    public function setParameter($parameter, $value);
-
-    /**
-     * Get the value of $parameter.
-     *
-     * @param string $parameter
-     *
-     * @return string
-     */
-    public function getParameter($parameter);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index 1ca504e75..ab3ce6b19 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -8,39 +8,42 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+
 /**
  * Creates MIME headers.
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
+class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
 {
     /** The HeaderEncoder used by these headers */
-    private $_encoder;
+    private $encoder;
 
     /** The Encoder used by parameters */
-    private $_paramEncoder;
+    private $paramEncoder;
 
-    /** The Grammar */
-    private $_grammar;
+    /** Strict EmailValidator */
+    private $emailValidator;
 
     /** The charset of created Headers */
-    private $_charset;
+    private $charset;
+
+    /** Swift_AddressEncoder */
+    private $addressEncoder;
 
     /**
      * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
      *
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder
-     * @param Swift_Mime_Grammar       $grammar
-     * @param string|null              $charset
+     * @param string|null $charset
      */
-    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, Swift_Mime_Grammar $grammar, $charset = null)
+    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null, Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->_encoder = $encoder;
-        $this->_paramEncoder = $paramEncoder;
-        $this->_grammar = $grammar;
-        $this->_charset = $charset;
+        $this->encoder = $encoder;
+        $this->paramEncoder = $paramEncoder;
+        $this->emailValidator = $emailValidator;
+        $this->charset = $charset;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -53,30 +56,29 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createMailboxHeader($name, $addresses = null)
     {
-        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->_encoder, $this->_grammar);
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator, $this->addressEncoder);
         if (isset($addresses)) {
             $header->setFieldBodyModel($addresses);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
 
     /**
-     * Create a new Date header using $timestamp (UNIX time).
+     * Create a new Date header using $dateTime.
      *
-     * @param string   $name
-     * @param int|null $timestamp
+     * @param string $name
      *
      * @return Swift_Mime_Header
      */
-    public function createDateHeader($name, $timestamp = null)
+    public function createDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $header = new Swift_Mime_Headers_DateHeader($name, $this->_grammar);
-        if (isset($timestamp)) {
-            $header->setFieldBodyModel($timestamp);
+        $header = new Swift_Mime_Headers_DateHeader($name);
+        if (isset($dateTime)) {
+            $header->setFieldBodyModel($dateTime);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -91,11 +93,11 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createTextHeader($name, $value = null)
     {
-        $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->_encoder, $this->_grammar);
+        $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->encoder);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -107,19 +109,18 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      * @param string $value
      * @param array  $params
      *
-     * @return Swift_Mime_ParameterizedHeader
+     * @return Swift_Mime_Headers_ParameterizedHeader
      */
-    public function createParameterizedHeader($name, $value = null,
-        $params = array())
+    public function createParameterizedHeader($name, $value = null, $params = [])
     {
-        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->_encoder, strtolower($name) == 'content-disposition' ? $this->_paramEncoder : null, $this->_grammar);
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name ?? '')) ? $this->paramEncoder : null);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
         foreach ($params as $k => $v) {
             $header->setParameter($k, $v);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -134,11 +135,11 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createIdHeader($name, $ids = null)
     {
-        $header = new Swift_Mime_Headers_IdentificationHeader($name, $this->_grammar);
+        $header = new Swift_Mime_Headers_IdentificationHeader($name, $this->emailValidator);
         if (isset($ids)) {
             $header->setFieldBodyModel($ids);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -153,11 +154,11 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createPathHeader($name, $path = null)
     {
-        $header = new Swift_Mime_Headers_PathHeader($name, $this->_grammar);
+        $header = new Swift_Mime_Headers_PathHeader($name, $this->emailValidator);
         if (isset($path)) {
             $header->setFieldBodyModel($path);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -169,9 +170,9 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function charsetChanged($charset)
     {
-        $this->_charset = $charset;
-        $this->_encoder->charsetChanged($charset);
-        $this->_paramEncoder->charsetChanged($charset);
+        $this->charset = $charset;
+        $this->encoder->charsetChanged($charset);
+        $this->paramEncoder->charsetChanged($charset);
     }
 
     /**
@@ -179,15 +180,16 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function __clone()
     {
-        $this->_encoder = clone $this->_encoder;
-        $this->_paramEncoder = clone $this->_paramEncoder;
+        $this->encoder = clone $this->encoder;
+        $this->paramEncoder = clone $this->paramEncoder;
+        $this->addressEncoder = clone $this->addressEncoder;
     }
 
     /** Apply the charset to the Header */
-    private function _setHeaderCharset(Swift_Mime_Header $header)
+    private function setHeaderCharset(Swift_Mime_Header $header)
     {
-        if (isset($this->_charset)) {
-            $header->setCharset($this->_charset);
+        if (isset($this->charset)) {
+            $header->setCharset($this->charset);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index a06ce7247..5195bcf48 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -13,37 +13,41 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
+class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
 {
     /** HeaderFactory */
-    private $_factory;
+    private $factory;
 
     /** Collection of set Headers */
-    private $_headers = array();
+    private $headers = [];
 
     /** Field ordering details */
-    private $_order = array();
+    private $order = [];
 
     /** List of fields which are required to be displayed */
-    private $_required = array();
+    private $required = [];
 
     /** The charset used by Headers */
-    private $_charset;
+    private $charset;
 
     /**
      * Create a new SimpleHeaderSet with the given $factory.
      *
-     * @param Swift_Mime_HeaderFactory $factory
-     * @param string                   $charset
+     * @param string $charset
      */
-    public function __construct(Swift_Mime_HeaderFactory $factory, $charset = null)
+    public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
     {
-        $this->_factory = $factory;
+        $this->factory = $factory;
         if (isset($charset)) {
             $this->setCharset($charset);
         }
     }
 
+    public function newInstance()
+    {
+        return new self($this->factory);
+    }
+
     /**
      * Set the charset used by these headers.
      *
@@ -51,9 +55,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function setCharset($charset)
     {
-        $this->_charset = $charset;
-        $this->_factory->charsetChanged($charset);
-        $this->_notifyHeadersOfCharset($charset);
+        $this->charset = $charset;
+        $this->factory->charsetChanged($charset);
+        $this->notifyHeadersOfCharset($charset);
     }
 
     /**
@@ -64,20 +68,17 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addMailboxHeader($name, $addresses = null)
     {
-        $this->_storeHeader($name,
-        $this->_factory->createMailboxHeader($name, $addresses));
+        $this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
     }
 
     /**
-     * Add a new Date header using $timestamp (UNIX time).
+     * Add a new Date header using $dateTime.
      *
      * @param string $name
-     * @param int    $timestamp
      */
-    public function addDateHeader($name, $timestamp = null)
+    public function addDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $this->_storeHeader($name,
-        $this->_factory->createDateHeader($name, $timestamp));
+        $this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
     }
 
     /**
@@ -88,8 +89,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addTextHeader($name, $value = null)
     {
-        $this->_storeHeader($name,
-        $this->_factory->createTextHeader($name, $value));
+        $this->storeHeader($name, $this->factory->createTextHeader($name, $value));
     }
 
     /**
@@ -99,9 +99,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      * @param string $value
      * @param array  $params
      */
-    public function addParameterizedHeader($name, $value = null, $params = array())
+    public function addParameterizedHeader($name, $value = null, $params = [])
     {
-        $this->_storeHeader($name, $this->_factory->createParameterizedHeader($name, $value, $params));
+        $this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
     }
 
     /**
@@ -112,7 +112,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addIdHeader($name, $ids = null)
     {
-        $this->_storeHeader($name, $this->_factory->createIdHeader($name, $ids));
+        $this->storeHeader($name, $this->factory->createIdHeader($name, $ids));
     }
 
     /**
@@ -123,7 +123,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addPathHeader($name, $path = null)
     {
-        $this->_storeHeader($name, $this->_factory->createPathHeader($name, $path));
+        $this->storeHeader($name, $this->factory->createPathHeader($name, $path));
     }
 
     /**
@@ -138,18 +138,18 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function has($name, $index = 0)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
 
-        if (!array_key_exists($lowerName, $this->_headers)) {
+        if (!\array_key_exists($lowerName, $this->headers)) {
             return false;
         }
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             // index was not specified, so we only need to check that there is at least one header value set
-            return (bool) count($this->_headers[$lowerName]);
+            return (bool) \count($this->headers[$lowerName]);
         }
 
-        return array_key_exists($index, $this->_headers[$lowerName]);
+        return \array_key_exists($index, $this->headers[$lowerName]);
     }
 
     /**
@@ -161,12 +161,11 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      * If $index is specified, the header will be inserted into the set at this
      * offset.
      *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
+     * @param int $index
      */
     public function set(Swift_Mime_Header $header, $index = 0)
     {
-        $this->_storeHeader($header->getFieldName(), $header, $index);
+        $this->storeHeader($header->getFieldName(), $header, $index);
     }
 
     /**
@@ -178,21 +177,21 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      * @param string $name
      * @param int    $index
      *
-     * @return Swift_Mime_Header
+     * @return Swift_Mime_Header|null
      */
     public function get($name, $index = 0)
     {
-        $name = strtolower($name);
+        $name = strtolower($name ?? '');
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             if ($this->has($name)) {
-                $values = array_values($this->_headers[$name]);
+                $values = array_values($this->headers[$name]);
 
                 return array_shift($values);
             }
         } else {
             if ($this->has($name, $index)) {
-                return $this->_headers[$name][$index];
+                return $this->headers[$name][$index];
             }
         }
     }
@@ -207,20 +206,20 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     public function getAll($name = null)
     {
         if (!isset($name)) {
-            $headers = array();
-            foreach ($this->_headers as $collection) {
+            $headers = [];
+            foreach ($this->headers as $collection) {
                 $headers = array_merge($headers, $collection);
             }
 
             return $headers;
         }
 
-        $lowerName = strtolower($name);
-        if (!array_key_exists($lowerName, $this->_headers)) {
-            return array();
+        $lowerName = strtolower($name ?? '');
+        if (!\array_key_exists($lowerName, $this->headers)) {
+            return [];
         }
 
-        return $this->_headers[$lowerName];
+        return $this->headers[$lowerName];
     }
 
     /**
@@ -230,9 +229,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function listAll()
     {
-        $headers = $this->_headers;
-        if ($this->_canSort()) {
-            uksort($headers, array($this, '_sortHeaders'));
+        $headers = $this->headers;
+        if ($this->canSort()) {
+            uksort($headers, [$this, 'sortHeaders']);
         }
 
         return array_keys($headers);
@@ -248,8 +247,8 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function remove($name, $index = 0)
     {
-        $lowerName = strtolower($name);
-        unset($this->_headers[$lowerName][$index]);
+        $lowerName = strtolower($name ?? '');
+        unset($this->headers[$lowerName][$index]);
     }
 
     /**
@@ -259,42 +258,28 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function removeAll($name)
     {
-        $lowerName = strtolower($name);
-        unset($this->_headers[$lowerName]);
-    }
-
-    /**
-     * Create a new instance of this HeaderSet.
-     *
-     * @return self
-     */
-    public function newInstance()
-    {
-        return new self($this->_factory);
+        $lowerName = strtolower($name ?? '');
+        unset($this->headers[$lowerName]);
     }
 
     /**
      * Define a list of Header names as an array in the correct order.
      *
      * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
      */
     public function defineOrdering(array $sequence)
     {
-        $this->_order = array_flip(array_map('strtolower', $sequence));
+        $this->order = array_flip(array_map('strtolower', $sequence));
     }
 
     /**
      * Set a list of header names which must always be displayed when set.
      *
      * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
      */
     public function setAlwaysDisplayed(array $names)
     {
-        $this->_required = array_flip(array_map('strtolower', $names));
+        $this->required = array_flip(array_map('strtolower', $names));
     }
 
     /**
@@ -315,13 +300,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     public function toString()
     {
         $string = '';
-        $headers = $this->_headers;
-        if ($this->_canSort()) {
-            uksort($headers, array($this, '_sortHeaders'));
+        $headers = $this->headers;
+        if ($this->canSort()) {
+            uksort($headers, [$this, 'sortHeaders']);
         }
         foreach ($headers as $collection) {
             foreach ($collection as $header) {
-                if ($this->_isDisplayed($header) || $header->getFieldBody() != '') {
+                if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
                     $string .= $header->toString();
                 }
             }
@@ -343,40 +328,40 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     }
 
     /** Save a Header to the internal collection */
-    private function _storeHeader($name, Swift_Mime_Header $header, $offset = null)
+    private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
     {
-        if (!isset($this->_headers[strtolower($name)])) {
-            $this->_headers[strtolower($name)] = array();
+        if (!isset($this->headers[strtolower($name ?? '')])) {
+            $this->headers[strtolower($name ?? '')] = [];
         }
         if (!isset($offset)) {
-            $this->_headers[strtolower($name)][] = $header;
+            $this->headers[strtolower($name ?? '')][] = $header;
         } else {
-            $this->_headers[strtolower($name)][$offset] = $header;
+            $this->headers[strtolower($name ?? '')][$offset] = $header;
         }
     }
 
     /** Test if the headers can be sorted */
-    private function _canSort()
+    private function canSort()
     {
-        return count($this->_order) > 0;
+        return \count($this->order) > 0;
     }
 
     /** uksort() algorithm for Header ordering */
-    private function _sortHeaders($a, $b)
+    private function sortHeaders($a, $b)
     {
-        $lowerA = strtolower($a);
-        $lowerB = strtolower($b);
-        $aPos = array_key_exists($lowerA, $this->_order) ? $this->_order[$lowerA] : -1;
-        $bPos = array_key_exists($lowerB, $this->_order) ? $this->_order[$lowerB] : -1;
+        $lowerA = strtolower($a ?? '');
+        $lowerB = strtolower($b ?? '');
+        $aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
+        $bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
 
         if (-1 === $aPos && -1 === $bPos) {
             // just be sure to be determinist here
             return $a > $b ? -1 : 1;
         }
 
-        if ($aPos == -1) {
+        if (-1 == $aPos) {
             return 1;
-        } elseif ($bPos == -1) {
+        } elseif (-1 == $bPos) {
             return -1;
         }
 
@@ -384,15 +369,15 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     }
 
     /** Test if the given Header is always displayed */
-    private function _isDisplayed(Swift_Mime_Header $header)
+    private function isDisplayed(Swift_Mime_Header $header)
     {
-        return array_key_exists(strtolower($header->getFieldName()), $this->_required);
+        return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
     }
 
     /** Notify all Headers of the new charset */
-    private function _notifyHeadersOfCharset($charset)
+    private function notifyHeadersOfCharset($charset)
     {
-        foreach ($this->_headers as $headerGroup) {
+        foreach ($this->headers as $headerGroup) {
             foreach ($headerGroup as $header) {
                 $header->setCharset($charset);
             }
@@ -404,10 +389,10 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function __clone()
     {
-        $this->_factory = clone $this->_factory;
-        foreach ($this->_headers as $groupKey => $headerGroup) {
+        $this->factory = clone $this->factory;
+        foreach ($this->headers as $groupKey => $headerGroup) {
             foreach ($headerGroup as $key => $header) {
-                $this->_headers[$groupKey][$key] = clone $header;
+                $this->headers[$groupKey][$key] = clone $header;
             }
         }
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index 72d40cee0..62da1650a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -13,7 +13,7 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime_Message
+class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 {
     const PRIORITY_HIGHEST = 1;
     const PRIORITY_HIGH = 2;
@@ -24,16 +24,12 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     /**
      * Create a new SimpleMessage with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param string                    $charset
+     * @param string $charset
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $charset = null)
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
-        parent::__construct($headers, $encoder, $cache, $grammar, $charset);
-        $this->getHeaders()->defineOrdering(array(
+        parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
+        $this->getHeaders()->defineOrdering([
             'Return-Path',
             'Received',
             'DKIM-Signature',
@@ -50,10 +46,10 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
             'MIME-Version',
             'Content-Type',
             'Content-Transfer-Encoding',
-            ));
-        $this->getHeaders()->setAlwaysDisplayed(array('Date', 'Message-ID', 'From'));
+            ]);
+        $this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
         $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
-        $this->setDate(time());
+        $this->setDate(new DateTimeImmutable());
         $this->setId($this->getId());
         $this->getHeaders()->addMailboxHeader('From');
     }
@@ -77,7 +73,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setSubject($subject)
     {
-        if (!$this->_setHeaderFieldModel('Subject', $subject)) {
+        if (!$this->setHeaderFieldModel('Subject', $subject)) {
             $this->getHeaders()->addTextHeader('Subject', $subject);
         }
 
@@ -91,20 +87,18 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getSubject()
     {
-        return $this->_getHeaderFieldModel('Subject');
+        return $this->getHeaderFieldModel('Subject');
     }
 
     /**
      * Set the date at which this message was created.
      *
-     * @param int $date
-     *
      * @return $this
      */
-    public function setDate($date)
+    public function setDate(DateTimeInterface $dateTime)
     {
-        if (!$this->_setHeaderFieldModel('Date', $date)) {
-            $this->getHeaders()->addDateHeader('Date', $date);
+        if (!$this->setHeaderFieldModel('Date', $dateTime)) {
+            $this->getHeaders()->addDateHeader('Date', $dateTime);
         }
 
         return $this;
@@ -113,11 +107,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     /**
      * Get the date at which this message was created.
      *
-     * @return int
+     * @return DateTimeInterface
      */
     public function getDate()
     {
-        return $this->_getHeaderFieldModel('Date');
+        return $this->getHeaderFieldModel('Date');
     }
 
     /**
@@ -129,7 +123,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setReturnPath($address)
     {
-        if (!$this->_setHeaderFieldModel('Return-Path', $address)) {
+        if (!$this->setHeaderFieldModel('Return-Path', $address)) {
             $this->getHeaders()->addPathHeader('Return-Path', $address);
         }
 
@@ -143,7 +137,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getReturnPath()
     {
-        return $this->_getHeaderFieldModel('Return-Path');
+        return $this->getHeaderFieldModel('Return-Path');
     }
 
     /**
@@ -158,11 +152,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setSender($address, $name = null)
     {
-        if (!is_array($address) && isset($name)) {
-            $address = array($address => $name);
+        if (!\is_array($address) && isset($name)) {
+            $address = [$address => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Sender', (array) $address)) {
+        if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
             $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
         }
 
@@ -176,7 +170,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getSender()
     {
-        return $this->_getHeaderFieldModel('Sender');
+        return $this->getHeaderFieldModel('Sender');
     }
 
     /**
@@ -212,11 +206,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setFrom($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('From', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
         }
 
@@ -230,7 +224,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getFrom()
     {
-        return $this->_getHeaderFieldModel('From');
+        return $this->getHeaderFieldModel('From');
     }
 
     /**
@@ -266,11 +260,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setReplyTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
         }
 
@@ -284,7 +278,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getReplyTo()
     {
-        return $this->_getHeaderFieldModel('Reply-To');
+        return $this->getHeaderFieldModel('Reply-To');
     }
 
     /**
@@ -321,11 +315,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('To', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
         }
 
@@ -339,7 +333,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getTo()
     {
-        return $this->_getHeaderFieldModel('To');
+        return $this->getHeaderFieldModel('To');
     }
 
     /**
@@ -373,11 +367,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setCc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Cc', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
         }
 
@@ -391,7 +385,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getCc()
     {
-        return $this->_getHeaderFieldModel('Cc');
+        return $this->getHeaderFieldModel('Cc');
     }
 
     /**
@@ -425,11 +419,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setBcc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
         }
 
@@ -443,7 +437,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getBcc()
     {
-        return $this->_getHeaderFieldModel('Bcc');
+        return $this->getHeaderFieldModel('Bcc');
     }
 
     /**
@@ -457,20 +451,20 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setPriority($priority)
     {
-        $priorityMap = array(
+        $priorityMap = [
             self::PRIORITY_HIGHEST => 'Highest',
             self::PRIORITY_HIGH => 'High',
             self::PRIORITY_NORMAL => 'Normal',
             self::PRIORITY_LOW => 'Low',
             self::PRIORITY_LOWEST => 'Lowest',
-            );
+            ];
         $pMapKeys = array_keys($priorityMap);
         if ($priority > max($pMapKeys)) {
             $priority = max($pMapKeys);
         } elseif ($priority < min($pMapKeys)) {
             $priority = min($pMapKeys);
         }
-        if (!$this->_setHeaderFieldModel('X-Priority',
+        if (!$this->setHeaderFieldModel('X-Priority',
             sprintf('%d (%s)', $priority, $priorityMap[$priority]))) {
             $this->getHeaders()->addTextHeader('X-Priority',
                 sprintf('%d (%s)', $priority, $priorityMap[$priority]));
@@ -489,11 +483,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getPriority()
     {
-        list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
+        list($priority) = sscanf($this->getHeaderFieldModel('X-Priority'),
             '%[1-5]'
             );
 
-        return isset($priority) ? $priority : 3;
+        return $priority ?? 3;
     }
 
     /**
@@ -505,7 +499,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setReadReceiptTo($addresses)
     {
-        if (!$this->_setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
+        if (!$this->setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
             $this->getHeaders()
                 ->addMailboxHeader('Disposition-Notification-To', $addresses);
         }
@@ -520,19 +514,17 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getReadReceiptTo()
     {
-        return $this->_getHeaderFieldModel('Disposition-Notification-To');
+        return $this->getHeaderFieldModel('Disposition-Notification-To');
     }
 
     /**
-     * Attach a {@link Swift_Mime_MimeEntity} such as an Attachment or MimePart.
-     *
-     * @param Swift_Mime_MimeEntity $entity
+     * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
      *
      * @return $this
      */
-    public function attach(Swift_Mime_MimeEntity $entity)
+    public function attach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $this->setChildren(array_merge($this->getChildren(), array($entity)));
+        $this->setChildren(array_merge($this->getChildren(), [$entity]));
 
         return $this;
     }
@@ -540,13 +532,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     /**
      * Remove an already attached entity.
      *
-     * @param Swift_Mime_MimeEntity $entity
-     *
      * @return $this
      */
-    public function detach(Swift_Mime_MimeEntity $entity)
+    public function detach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $newChildren = array();
+        $newChildren = [];
         foreach ($this->getChildren() as $child) {
             if ($entity !== $child) {
                 $newChildren[] = $child;
@@ -558,14 +548,13 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     }
 
     /**
-     * Attach a {@link Swift_Mime_MimeEntity} and return it's CID source.
-     * This method should be used when embedding images or other data in a message.
+     * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
      *
-     * @param Swift_Mime_MimeEntity $entity
+     * This method should be used when embedding images or other data in a message.
      *
      * @return string
      */
-    public function embed(Swift_Mime_MimeEntity $entity)
+    public function embed(Swift_Mime_SimpleMimeEntity $entity)
     {
         $this->attach($entity);
 
@@ -579,8 +568,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function toString()
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             $string = parent::toString();
             $this->setChildren($children);
         } else {
@@ -604,13 +593,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             parent::toByteStream($is);
             $this->setChildren($children);
         } else {
@@ -618,29 +605,29 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
         }
     }
 
-    /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */
-    protected function _getIdField()
+    /** @see Swift_Mime_SimpleMimeEntity::getIdField() */
+    protected function getIdField()
     {
         return 'Message-ID';
     }
 
     /** Turn the body of this message into a child of itself if needed */
-    protected function _becomeMimePart()
+    protected function becomeMimePart()
     {
         $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
-            $this->_getCache(), $this->_getGrammar(), $this->_userCharset
+            $this->getCache(), $this->getIdGenerator(), $this->userCharset
             );
-        $part->setContentType($this->_userContentType);
+        $part->setContentType($this->userContentType);
         $part->setBody($this->getBody());
-        $part->setFormat($this->_userFormat);
-        $part->setDelSp($this->_userDelSp);
-        $part->_setNestingLevel($this->_getTopNestingLevel());
+        $part->setFormat($this->userFormat);
+        $part->setDelSp($this->userDelSp);
+        $part->setNestingLevel($this->getTopNestingLevel());
 
         return $part;
     }
 
     /** Get the highest nesting level nested inside this message */
-    private function _getTopNestingLevel()
+    private function getTopNestingLevel()
     {
         $highestLevel = $this->getNestingLevel();
         foreach ($this->getChildren() as $child) {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index a13f1b23d..03eaf472d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -13,79 +13,86 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
+class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
 {
+    /** Main message document; there can only be one of these */
+    const LEVEL_TOP = 16;
+
+    /** An entity which nests with the same precedence as an attachment */
+    const LEVEL_MIXED = 256;
+
+    /** An entity which nests with the same precedence as a mime part */
+    const LEVEL_ALTERNATIVE = 4096;
+
+    /** An entity which nests with the same precedence as embedded content */
+    const LEVEL_RELATED = 65536;
+
     /** A collection of Headers for this mime entity */
-    private $_headers;
+    private $headers;
 
     /** The body as a string, or a stream */
-    private $_body;
+    private $body;
 
     /** The encoder that encodes the body into a streamable format */
-    private $_encoder;
+    private $encoder;
 
-    /** The grammar to use for id validation */
-    private $_grammar;
+    /** Message ID generator */
+    private $idGenerator;
 
     /** A mime boundary, if any is used */
-    private $_boundary;
+    private $boundary;
 
     /** Mime types to be used based on the nesting level */
-    private $_compositeRanges = array(
-        'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
-        'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
-        'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED),
-    );
+    private $compositeRanges = [
+        'multipart/mixed' => [self::LEVEL_TOP, self::LEVEL_MIXED],
+        'multipart/alternative' => [self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE],
+        'multipart/related' => [self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED],
+    ];
 
     /** A set of filter rules to define what level an entity should be nested at */
-    private $_compoundLevelFilters = array();
+    private $compoundLevelFilters = [];
 
     /** The nesting level of this entity */
-    private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+    private $nestingLevel = self::LEVEL_ALTERNATIVE;
 
     /** A KeyCache instance used during encoding and streaming */
-    private $_cache;
+    private $cache;
 
     /** Direct descendants of this entity */
-    private $_immediateChildren = array();
+    private $immediateChildren = [];
 
     /** All descendants of this entity */
-    private $_children = array();
+    private $children = [];
 
     /** The maximum line length of the body of this entity */
-    private $_maxLineLength = 78;
+    private $maxLineLength = 78;
 
     /** The order in which alternative mime types should appear */
-    private $_alternativePartOrder = array(
+    private $alternativePartOrder = [
         'text/plain' => 1,
         'text/html' => 2,
         'multipart/related' => 3,
-    );
+    ];
 
     /** The CID of this entity */
-    private $_id;
+    private $id;
 
     /** The key used for accessing the cache */
-    private $_cacheKey;
+    private $cacheKey;
 
-    protected $_userContentType;
+    protected $userContentType;
 
     /**
      * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
-     *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar)
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator)
     {
-        $this->_cacheKey = md5(uniqid(getmypid().mt_rand(), true));
-        $this->_cache = $cache;
-        $this->_headers = $headers;
-        $this->_grammar = $grammar;
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $this->cache = $cache;
+        $this->headers = $headers;
+        $this->idGenerator = $idGenerator;
         $this->setEncoder($encoder);
-        $this->_headers->defineOrdering(array('Content-Type', 'Content-Transfer-Encoding'));
+        $this->headers->defineOrdering(['Content-Type', 'Content-Transfer-Encoding']);
 
         // This array specifies that, when the entire MIME document contains
         // $compoundLevel, then for each child within $level, if its Content-Type
@@ -100,16 +107,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         //   )
         // )
 
-        $this->_compoundLevelFilters = array(
-            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
-                self::LEVEL_ALTERNATIVE => array(
+        $this->compoundLevelFilters = [
+            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => [
+                self::LEVEL_ALTERNATIVE => [
                     'text/plain' => self::LEVEL_ALTERNATIVE,
                     'text/html' => self::LEVEL_RELATED,
-                    ),
-                ),
-            );
+                    ],
+                ],
+            ];
 
-        $this->_id = $this->getRandomId();
+        $this->id = $this->idGenerator->generateId();
     }
 
     /**
@@ -119,19 +126,19 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function generateId()
     {
-        $this->setId($this->getRandomId());
+        $this->setId($this->idGenerator->generateId());
 
-        return $this->_id;
+        return $this->id;
     }
 
     /**
-     * Get the {@link Swift_Mime_HeaderSet} for this entity.
+     * Get the {@link Swift_Mime_SimpleHeaderSet} for this entity.
      *
-     * @return Swift_Mime_HeaderSet
+     * @return Swift_Mime_SimpleHeaderSet
      */
     public function getHeaders()
     {
-        return $this->_headers;
+        return $this->headers;
     }
 
     /**
@@ -143,7 +150,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getNestingLevel()
     {
-        return $this->_nestingLevel;
+        return $this->nestingLevel;
     }
 
     /**
@@ -153,7 +160,17 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getContentType()
     {
-        return $this->_getHeaderFieldModel('Content-Type');
+        return $this->getHeaderFieldModel('Content-Type');
+    }
+
+    /**
+     * Get the Body Content-type of this entity.
+     *
+     * @return string
+     */
+    public function getBodyContentType()
+    {
+        return $this->userContentType;
     }
 
     /**
@@ -165,10 +182,10 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setContentType($type)
     {
-        $this->_setContentTypeInHeaders($type);
+        $this->setContentTypeInHeaders($type);
         // Keep track of the value so that if the content-type changes automatically
         // due to added child entities, it can be restored if they are later removed
-        $this->_userContentType = $type;
+        $this->userContentType = $type;
 
         return $this;
     }
@@ -182,9 +199,9 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getId()
     {
-        $tmp = (array) $this->_getHeaderFieldModel($this->_getIdField());
+        $tmp = (array) $this->getHeaderFieldModel($this->getIdField());
 
-        return $this->_headers->has($this->_getIdField()) ? current($tmp) : $this->_id;
+        return $this->headers->has($this->getIdField()) ? current($tmp) : $this->id;
     }
 
     /**
@@ -196,10 +213,10 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setId($id)
     {
-        if (!$this->_setHeaderFieldModel($this->_getIdField(), $id)) {
-            $this->_headers->addIdHeader($this->_getIdField(), $id);
+        if (!$this->setHeaderFieldModel($this->getIdField(), $id)) {
+            $this->headers->addIdHeader($this->getIdField(), $id);
         }
-        $this->_id = $id;
+        $this->id = $id;
 
         return $this;
     }
@@ -213,7 +230,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getDescription()
     {
-        return $this->_getHeaderFieldModel('Content-Description');
+        return $this->getHeaderFieldModel('Content-Description');
     }
 
     /**
@@ -227,8 +244,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setDescription($description)
     {
-        if (!$this->_setHeaderFieldModel('Content-Description', $description)) {
-            $this->_headers->addTextHeader('Content-Description', $description);
+        if (!$this->setHeaderFieldModel('Content-Description', $description)) {
+            $this->headers->addTextHeader('Content-Description', $description);
         }
 
         return $this;
@@ -241,7 +258,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getMaxLineLength()
     {
-        return $this->_maxLineLength;
+        return $this->maxLineLength;
     }
 
     /**
@@ -255,7 +272,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setMaxLineLength($length)
     {
-        $this->_maxLineLength = $length;
+        $this->maxLineLength = $length;
 
         return $this;
     }
@@ -263,44 +280,43 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get all children added to this entity.
      *
-     * @return Swift_Mime_MimeEntity[]
+     * @return Swift_Mime_SimpleMimeEntity[]
      */
     public function getChildren()
     {
-        return $this->_children;
+        return $this->children;
     }
 
     /**
      * Set all children of this entity.
      *
-     * @param Swift_Mime_MimeEntity[] $children
-     * @param int                     $compoundLevel For internal use only
+     * @param Swift_Mime_SimpleMimeEntity[] $children
+     * @param int                           $compoundLevel For internal use only
      *
      * @return $this
      */
     public function setChildren(array $children, $compoundLevel = null)
     {
         // TODO: Try to refactor this logic
-
-        $compoundLevel = isset($compoundLevel) ? $compoundLevel : $this->_getCompoundLevel($children);
-        $immediateChildren = array();
-        $grandchildren = array();
-        $newContentType = $this->_userContentType;
+        $compoundLevel = $compoundLevel ?? $this->getCompoundLevel($children);
+        $immediateChildren = [];
+        $grandchildren = [];
+        $newContentType = $this->userContentType;
 
         foreach ($children as $child) {
-            $level = $this->_getNeededChildLevel($child, $compoundLevel);
+            $level = $this->getNeededChildLevel($child, $compoundLevel);
             if (empty($immediateChildren)) {
                 //first iteration
-                $immediateChildren = array($child);
+                $immediateChildren = [$child];
             } else {
-                $nextLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+                $nextLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
                 if ($nextLevel == $level) {
                     $immediateChildren[] = $child;
                 } elseif ($level < $nextLevel) {
                     // Re-assign immediateChildren to grandchildren
                     $grandchildren = array_merge($grandchildren, $immediateChildren);
                     // Set new children
-                    $immediateChildren = array($child);
+                    $immediateChildren = [$child];
                 } else {
                     $grandchildren[] = $child;
                 }
@@ -308,11 +324,11 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         }
 
         if ($immediateChildren) {
-            $lowestLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+            $lowestLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
 
             // Determine which composite media type is needed to accommodate the
             // immediate children
-            foreach ($this->_compositeRanges as $mediaType => $range) {
+            foreach ($this->compositeRanges as $mediaType => $range) {
                 if ($lowestLevel > $range[0] && $lowestLevel <= $range[1]) {
                     $newContentType = $mediaType;
 
@@ -322,18 +338,18 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
 
             // Put any grandchildren in a subpart
             if (!empty($grandchildren)) {
-                $subentity = $this->_createChild();
-                $subentity->_setNestingLevel($lowestLevel);
+                $subentity = $this->createChild();
+                $subentity->setNestingLevel($lowestLevel);
                 $subentity->setChildren($grandchildren, $compoundLevel);
                 array_unshift($immediateChildren, $subentity);
             }
         }
 
-        $this->_immediateChildren = $immediateChildren;
-        $this->_children = $children;
-        $this->_setContentTypeInHeaders($newContentType);
-        $this->_fixHeaders();
-        $this->_sortChildren();
+        $this->immediateChildren = $immediateChildren;
+        $this->children = $children;
+        $this->setContentTypeInHeaders($newContentType);
+        $this->fixHeaders();
+        $this->sortChildren();
 
         return $this;
     }
@@ -345,7 +361,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getBody()
     {
-        return $this->_body instanceof Swift_OutputByteStream ? $this->_readStream($this->_body) : $this->_body;
+        return $this->body instanceof Swift_OutputByteStream ? $this->readStream($this->body) : $this->body;
     }
 
     /**
@@ -359,12 +375,12 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setBody($body, $contentType = null)
     {
-        if ($body !== $this->_body) {
-            $this->_clearCache();
+        if ($body !== $this->body) {
+            $this->clearCache();
         }
 
-        $this->_body = $body;
-        if (isset($contentType)) {
+        $this->body = $body;
+        if (null !== $contentType) {
             $this->setContentType($contentType);
         }
 
@@ -378,25 +394,23 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getEncoder()
     {
-        return $this->_encoder;
+        return $this->encoder;
     }
 
     /**
      * Set the encoder used for the body of this entity.
      *
-     * @param Swift_Mime_ContentEncoder $encoder
-     *
      * @return $this
      */
     public function setEncoder(Swift_Mime_ContentEncoder $encoder)
     {
-        if ($encoder !== $this->_encoder) {
-            $this->_clearCache();
+        if ($encoder !== $this->encoder) {
+            $this->clearCache();
         }
 
-        $this->_encoder = $encoder;
-        $this->_setEncoding($encoder->getName());
-        $this->_notifyEncoderChanged($encoder);
+        $this->encoder = $encoder;
+        $this->setEncoding($encoder->getName());
+        $this->notifyEncoderChanged($encoder);
 
         return $this;
     }
@@ -408,11 +422,11 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getBoundary()
     {
-        if (!isset($this->_boundary)) {
-            $this->_boundary = '_=_swift_v4_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
+        if (!isset($this->boundary)) {
+            $this->boundary = '_=_swift_'.time().'_'.bin2hex(random_bytes(16)).'_=_';
         }
 
-        return $this->_boundary;
+        return $this->boundary;
     }
 
     /**
@@ -426,8 +440,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setBoundary($boundary)
     {
-        $this->_assertValidBoundary($boundary);
-        $this->_boundary = $boundary;
+        $this->assertValidBoundary($boundary);
+        $this->boundary = $boundary;
 
         return $this;
     }
@@ -440,18 +454,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function charsetChanged($charset)
     {
-        $this->_notifyCharsetChanged($charset);
+        $this->notifyCharsetChanged($charset);
     }
 
     /**
      * Receive notification that the encoder of this entity or a parent entity
      * has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
-        $this->_notifyEncoderChanged($encoder);
+        $this->notifyEncoderChanged($encoder);
     }
 
     /**
@@ -461,8 +473,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function toString()
     {
-        $string = $this->_headers->toString();
-        $string .= $this->_bodyToString();
+        $string = $this->headers->toString();
+        $string .= $this->bodyToString();
 
         return $string;
     }
@@ -472,22 +484,22 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      *
      * @return string
      */
-    protected function _bodyToString()
+    protected function bodyToString()
     {
         $string = '';
 
-        if (isset($this->_body) && empty($this->_immediateChildren)) {
-            if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
-                $body = $this->_cache->getString($this->_cacheKey, 'body');
+        if (isset($this->body) && empty($this->immediateChildren)) {
+            if ($this->cache->hasKey($this->cacheKey, 'body')) {
+                $body = $this->cache->getString($this->cacheKey, 'body');
             } else {
-                $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
-                $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
+                $body = "\r\n".$this->encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
+                $this->cache->setString($this->cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
             }
             $string .= $body;
         }
 
-        if (!empty($this->_immediateChildren)) {
-            foreach ($this->_immediateChildren as $child) {
+        if (!empty($this->immediateChildren)) {
+            foreach ($this->immediateChildren as $child) {
                 $string .= "\r\n\r\n--".$this->getBoundary()."\r\n";
                 $string .= $child->toString();
             }
@@ -511,42 +523,38 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
 
     /**
      * Write this entire entity to a {@see Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        $is->write($this->_headers->toString());
+        $is->write($this->headers->toString());
         $is->commit();
 
-        $this->_bodyToByteStream($is);
+        $this->bodyToByteStream($is);
     }
 
     /**
      * Write this entire entity to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
-    protected function _bodyToByteStream(Swift_InputByteStream $is)
+    protected function bodyToByteStream(Swift_InputByteStream $is)
     {
-        if (empty($this->_immediateChildren)) {
-            if (isset($this->_body)) {
-                if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
-                    $this->_cache->exportToByteStream($this->_cacheKey, 'body', $is);
+        if (empty($this->immediateChildren)) {
+            if (isset($this->body)) {
+                if ($this->cache->hasKey($this->cacheKey, 'body')) {
+                    $this->cache->exportToByteStream($this->cacheKey, 'body', $is);
                 } else {
-                    $cacheIs = $this->_cache->getInputByteStream($this->_cacheKey, 'body');
+                    $cacheIs = $this->cache->getInputByteStream($this->cacheKey, 'body');
                     if ($cacheIs) {
                         $is->bind($cacheIs);
                     }
 
                     $is->write("\r\n");
 
-                    if ($this->_body instanceof Swift_OutputByteStream) {
-                        $this->_body->setReadPointer(0);
+                    if ($this->body instanceof Swift_OutputByteStream) {
+                        $this->body->setReadPointer(0);
 
-                        $this->_encoder->encodeByteStream($this->_body, $is, 0, $this->getMaxLineLength());
+                        $this->encoder->encodeByteStream($this->body, $is, 0, $this->getMaxLineLength());
                     } else {
-                        $is->write($this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()));
+                        $is->write($this->encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()));
                     }
 
                     if ($cacheIs) {
@@ -556,8 +564,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
             }
         }
 
-        if (!empty($this->_immediateChildren)) {
-            foreach ($this->_immediateChildren as $child) {
+        if (!empty($this->immediateChildren)) {
+            foreach ($this->immediateChildren as $child) {
                 $is->write("\r\n\r\n--".$this->getBoundary()."\r\n");
                 $child->toByteStream($is);
             }
@@ -568,7 +576,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get the name of the header that provides the ID of this entity.
      */
-    protected function _getIdField()
+    protected function getIdField()
     {
         return 'Content-ID';
     }
@@ -576,20 +584,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get the model data (usually an array or a string) for $field.
      */
-    protected function _getHeaderFieldModel($field)
+    protected function getHeaderFieldModel($field)
     {
-        if ($this->_headers->has($field)) {
-            return $this->_headers->get($field)->getFieldBodyModel();
+        if ($this->headers->has($field)) {
+            return $this->headers->get($field)->getFieldBodyModel();
         }
     }
 
     /**
      * Set the model data for $field.
      */
-    protected function _setHeaderFieldModel($field, $model)
+    protected function setHeaderFieldModel($field, $model)
     {
-        if ($this->_headers->has($field)) {
-            $this->_headers->get($field)->setFieldBodyModel($model);
+        if ($this->headers->has($field)) {
+            $this->headers->get($field)->setFieldBodyModel($model);
 
             return true;
         }
@@ -600,20 +608,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get the parameter value of $parameter on $field header.
      */
-    protected function _getHeaderParameter($field, $parameter)
+    protected function getHeaderParameter($field, $parameter)
     {
-        if ($this->_headers->has($field)) {
-            return $this->_headers->get($field)->getParameter($parameter);
+        if ($this->headers->has($field)) {
+            return $this->headers->get($field)->getParameter($parameter);
         }
     }
 
     /**
      * Set the parameter value of $parameter on $field header.
      */
-    protected function _setHeaderParameter($field, $parameter, $value)
+    protected function setHeaderParameter($field, $parameter, $value)
     {
-        if ($this->_headers->has($field)) {
-            $this->_headers->get($field)->setParameter($parameter, $value);
+        if ($this->headers->has($field)) {
+            $this->headers->get($field)->setParameter($parameter, $value);
 
             return true;
         }
@@ -624,16 +632,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Re-evaluate what content type and encoding should be used on this entity.
      */
-    protected function _fixHeaders()
+    protected function fixHeaders()
     {
-        if (count($this->_immediateChildren)) {
-            $this->_setHeaderParameter('Content-Type', 'boundary',
+        if (\count($this->immediateChildren)) {
+            $this->setHeaderParameter('Content-Type', 'boundary',
                 $this->getBoundary()
                 );
-            $this->_headers->remove('Content-Transfer-Encoding');
+            $this->headers->remove('Content-Transfer-Encoding');
         } else {
-            $this->_setHeaderParameter('Content-Type', 'boundary', null);
-            $this->_setEncoding($this->_encoder->getName());
+            $this->setHeaderParameter('Content-Type', 'boundary', null);
+            $this->setEncoding($this->encoder->getName());
         }
     }
 
@@ -642,50 +650,30 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      *
      * @return Swift_KeyCache
      */
-    protected function _getCache()
+    protected function getCache()
     {
-        return $this->_cache;
+        return $this->cache;
     }
 
     /**
-     * Get the grammar used for validation.
+     * Get the ID generator.
      *
-     * @return Swift_Mime_Grammar
+     * @return Swift_IdGenerator
      */
-    protected function _getGrammar()
+    protected function getIdGenerator()
     {
-        return $this->_grammar;
+        return $this->idGenerator;
     }
 
     /**
      * Empty the KeyCache for this entity.
      */
-    protected function _clearCache()
+    protected function clearCache()
     {
-        $this->_cache->clearKey($this->_cacheKey, 'body');
+        $this->cache->clearKey($this->cacheKey, 'body');
     }
 
-    /**
-     * Returns a random Content-ID or Message-ID.
-     *
-     * @return string
-     */
-    protected function getRandomId()
-    {
-        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
-        $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
-        $id = $idLeft.'@'.$idRight;
-
-        try {
-            $this->_assertValidId($id);
-        } catch (Swift_RfcComplianceException $e) {
-            $id = $idLeft.'@swift.generated';
-        }
-
-        return $id;
-    }
-
-    private function _readStream(Swift_OutputByteStream $os)
+    private function readStream(Swift_OutputByteStream $os)
     {
         $string = '';
         while (false !== $bytes = $os->read(8192)) {
@@ -697,33 +685,33 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         return $string;
     }
 
-    private function _setEncoding($encoding)
+    private function setEncoding($encoding)
     {
-        if (!$this->_setHeaderFieldModel('Content-Transfer-Encoding', $encoding)) {
-            $this->_headers->addTextHeader('Content-Transfer-Encoding', $encoding);
+        if (!$this->setHeaderFieldModel('Content-Transfer-Encoding', $encoding)) {
+            $this->headers->addTextHeader('Content-Transfer-Encoding', $encoding);
         }
     }
 
-    private function _assertValidBoundary($boundary)
+    private function assertValidBoundary($boundary)
     {
         if (!preg_match('/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di', $boundary)) {
             throw new Swift_RfcComplianceException('Mime boundary set is not RFC 2046 compliant.');
         }
     }
 
-    private function _setContentTypeInHeaders($type)
+    private function setContentTypeInHeaders($type)
     {
-        if (!$this->_setHeaderFieldModel('Content-Type', $type)) {
-            $this->_headers->addParameterizedHeader('Content-Type', $type);
+        if (!$this->setHeaderFieldModel('Content-Type', $type)) {
+            $this->headers->addParameterizedHeader('Content-Type', $type);
         }
     }
 
-    private function _setNestingLevel($level)
+    private function setNestingLevel($level)
     {
-        $this->_nestingLevel = $level;
+        $this->nestingLevel = $level;
     }
 
-    private function _getCompoundLevel($children)
+    private function getCompoundLevel($children)
     {
         $level = 0;
         foreach ($children as $child) {
@@ -733,17 +721,17 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         return $level;
     }
 
-    private function _getNeededChildLevel($child, $compoundLevel)
+    private function getNeededChildLevel($child, $compoundLevel)
     {
-        $filter = array();
-        foreach ($this->_compoundLevelFilters as $bitmask => $rules) {
+        $filter = [];
+        foreach ($this->compoundLevelFilters as $bitmask => $rules) {
             if (($compoundLevel & $bitmask) === $bitmask) {
                 $filter = $rules + $filter;
             }
         }
 
         $realLevel = $child->getNestingLevel();
-        $lowercaseType = strtolower($child->getContentType());
+        $lowercaseType = strtolower($child->getContentType() ?? '');
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
             return $filter[$realLevel][$lowercaseType];
@@ -752,33 +740,33 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         return $realLevel;
     }
 
-    private function _createChild()
+    private function createChild()
     {
-        return new self($this->_headers->newInstance(), $this->_encoder, $this->_cache, $this->_grammar);
+        return new self($this->headers->newInstance(), $this->encoder, $this->cache, $this->idGenerator);
     }
 
-    private function _notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
+    private function notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
-        foreach ($this->_immediateChildren as $child) {
+        foreach ($this->immediateChildren as $child) {
             $child->encoderChanged($encoder);
         }
     }
 
-    private function _notifyCharsetChanged($charset)
+    private function notifyCharsetChanged($charset)
     {
-        $this->_encoder->charsetChanged($charset);
-        $this->_headers->charsetChanged($charset);
-        foreach ($this->_immediateChildren as $child) {
+        $this->encoder->charsetChanged($charset);
+        $this->headers->charsetChanged($charset);
+        foreach ($this->immediateChildren as $child) {
             $child->charsetChanged($charset);
         }
     }
 
-    private function _sortChildren()
+    private function sortChildren()
     {
         $shouldSort = false;
-        foreach ($this->_immediateChildren as $child) {
+        foreach ($this->immediateChildren as $child) {
             // NOTE: This include alternative parts moved into a related part
-            if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE) {
+            if (self::LEVEL_ALTERNATIVE == $child->getNestingLevel()) {
                 $shouldSort = true;
                 break;
             }
@@ -787,13 +775,13 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         // Sort in order of preference, if there is one
         if ($shouldSort) {
             // Group the messages by order of preference
-            $sorted = array();
-            foreach ($this->_immediateChildren as $child) {
+            $sorted = [];
+            foreach ($this->immediateChildren as $child) {
                 $type = $child->getContentType();
-                $level = array_key_exists($type, $this->_alternativePartOrder) ? $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1;
+                $level = \array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
 
                 if (empty($sorted[$level])) {
-                    $sorted[$level] = array();
+                    $sorted[$level] = [];
                 }
 
                 $sorted[$level][] = $child;
@@ -801,7 +789,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
 
             ksort($sorted);
 
-            $this->_immediateChildren = array_reduce($sorted, 'array_merge', array());
+            $this->immediateChildren = array_reduce($sorted, 'array_merge', []);
         }
     }
 
@@ -810,22 +798,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function __destruct()
     {
-        if ($this->_cache instanceof Swift_KeyCache) {
-            $this->_cache->clearAll($this->_cacheKey);
-        }
-    }
-
-    /**
-     * Throws an Exception if the id passed does not comply with RFC 2822.
-     *
-     * @param string $id
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    private function _assertValidId($id)
-    {
-        if (!preg_match('/^'.$this->_grammar->getDefinition('id-left').'@'.$this->_grammar->getDefinition('id-right').'$/D', $id)) {
-            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
+        if ($this->cache instanceof Swift_KeyCache) {
+            $this->cache->clearAll($this->cacheKey);
         }
     }
 
@@ -834,13 +808,19 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function __clone()
     {
-        $this->_headers = clone $this->_headers;
-        $this->_encoder = clone $this->_encoder;
-        $this->_cacheKey = md5(uniqid(getmypid().mt_rand(), true));
-        $children = array();
-        foreach ($this->_children as $pos => $child) {
+        $this->headers = clone $this->headers;
+        $this->encoder = clone $this->encoder;
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $children = [];
+        foreach ($this->children as $pos => $child) {
             $children[$pos] = clone $child;
         }
         $this->setChildren($children);
     }
+
+    public function __wakeup()
+    {
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $this->cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
index 525b7ec8e..ea97619ad 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
@@ -26,8 +26,8 @@ class Swift_MimePart extends Swift_Mime_MimePart
      */
     public function __construct($body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_MimePart::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_MimePart::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.part')
             );
@@ -42,18 +42,4 @@ class Swift_MimePart extends Swift_Mime_MimePart
             $this->setContentType($contentType);
         }
     }
-
-    /**
-     * Create a new MimePart.
-     *
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     *
-     * @return self
-     */
-    public static function newInstance($body = null, $contentType = null, $charset = null)
-    {
-        return new self($body, $contentType, $charset);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
index ddde335c5..e44b7af98 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -17,20 +17,10 @@ class Swift_NullTransport extends Swift_Transport_NullTransport
 {
     public function __construct()
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_NullTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_NullTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.null')
         );
     }
-
-    /**
-     * Create a new NullTransport instance.
-     *
-     * @return self
-     */
-    public static function newInstance()
-    {
-        return new self();
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
index a2ec2abcd..5b1d7deef 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -20,28 +20,28 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      *
      * @var int
      */
-    private $_threshold;
+    private $threshold;
 
     /**
      * The number of seconds to sleep for during a restart.
      *
      * @var int
      */
-    private $_sleep;
+    private $sleep;
 
     /**
      * The internal counter.
      *
      * @var int
      */
-    private $_counter = 0;
+    private $counter = 0;
 
     /**
      * The Sleeper instance for sleeping.
      *
      * @var Swift_Plugins_Sleeper
      */
-    private $_sleeper;
+    private $sleeper;
 
     /**
      * Create a new AntiFloodPlugin with $threshold and $sleep time.
@@ -54,7 +54,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
     {
         $this->setThreshold($threshold);
         $this->setSleepTime($sleep);
-        $this->_sleeper = $sleeper;
+        $this->sleeper = $sleeper;
     }
 
     /**
@@ -64,7 +64,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function setThreshold($threshold)
     {
-        $this->_threshold = $threshold;
+        $this->threshold = $threshold;
     }
 
     /**
@@ -74,7 +74,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function getThreshold()
     {
-        return $this->_threshold;
+        return $this->threshold;
     }
 
     /**
@@ -84,7 +84,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function setSleepTime($sleep)
     {
-        $this->_sleep = $sleep;
+        $this->sleep = $sleep;
     }
 
     /**
@@ -94,13 +94,11 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function getSleepTime()
     {
-        return $this->_sleep;
+        return $this->sleep;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -108,20 +106,18 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
-        ++$this->_counter;
-        if ($this->_counter >= $this->_threshold) {
+        ++$this->counter;
+        if ($this->counter >= $this->threshold) {
             $transport = $evt->getTransport();
             $transport->stop();
-            if ($this->_sleep) {
-                $this->sleep($this->_sleep);
+            if ($this->sleep) {
+                $this->sleep($this->sleep);
             }
             $transport->start();
-            $this->_counter = 0;
+            $this->counter = 0;
         }
     }
 
@@ -132,8 +128,8 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function sleep($seconds)
     {
-        if (isset($this->_sleeper)) {
-            $this->_sleeper->sleep($seconds);
+        if (isset($this->sleeper)) {
+            $this->sleeper->sleep($seconds);
         } else {
             sleep($seconds);
         }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
index f7e18d0eb..36451f44f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -20,17 +20,17 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * @var int
      */
-    private $_out = 0;
+    private $out = 0;
 
     /**
      * The incoming traffic counter.
      *
      * @var int
      */
-    private $_in = 0;
+    private $in = 0;
 
     /** Bound byte streams */
-    private $_mirrors = array();
+    private $mirrors = [];
 
     /**
      * Not used.
@@ -41,8 +41,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -52,24 +50,20 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
         $command = $evt->getCommand();
-        $this->_out += strlen($command);
+        $this->out += \strlen($command);
     }
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
         $response = $evt->getResponse();
-        $this->_in += strlen($response);
+        $this->in += \strlen($response);
     }
 
     /**
@@ -79,8 +73,8 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function write($bytes)
     {
-        $this->_out += strlen($bytes);
-        foreach ($this->_mirrors as $stream) {
+        $this->out += \strlen($bytes);
+        foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
     }
@@ -97,12 +91,10 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
-        $this->_mirrors[] = $is;
+        $this->mirrors[] = $is;
     }
 
     /**
@@ -111,14 +103,12 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
-        foreach ($this->_mirrors as $k => $stream) {
+        foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                unset($this->_mirrors[$k]);
+                unset($this->mirrors[$k]);
             }
         }
     }
@@ -128,7 +118,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function flushBuffers()
     {
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->flushBuffers();
         }
     }
@@ -140,7 +130,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function getBytesOut()
     {
-        return $this->_out;
+        return $this->out;
     }
 
     /**
@@ -150,7 +140,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function getBytesIn()
     {
-        return $this->_in;
+        return $this->in;
     }
 
     /**
@@ -158,7 +148,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function reset()
     {
-        $this->_out = 0;
-        $this->_in = 0;
+        $this->out = 0;
+        $this->in = 0;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
index 0762b36d2..93124c9a5 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
@@ -17,19 +17,19 @@
 class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_Plugins_Decorator_Replacements
 {
     /** The replacement map */
-    private $_replacements;
+    private $replacements;
 
     /** The body as it was before replacements */
-    private $_originalBody;
+    private $originalBody;
 
     /** The original headers of the message, before replacements */
-    private $_originalHeaders = array();
+    private $originalHeaders = [];
 
     /** Bodies of children before they are replaced */
-    private $_originalChildBodies = array();
+    private $originalChildBodies = [];
 
     /** The Message that was last replaced */
-    private $_lastMessage;
+    private $lastMessage;
 
     /**
      * Create a new DecoratorPlugin with $replacements.
@@ -66,21 +66,19 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
     public function setReplacements($replacements)
     {
         if (!($replacements instanceof Swift_Plugins_Decorator_Replacements)) {
-            $this->_replacements = (array) $replacements;
+            $this->replacements = (array) $replacements;
         } else {
-            $this->_replacements = $replacements;
+            $this->replacements = $replacements;
         }
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
         $message = $evt->getMessage();
-        $this->_restoreMessage($message);
+        $this->restoreMessage($message);
         $to = array_keys($message->getTo());
         $address = array_shift($to);
         if ($replacements = $this->getReplacementsFor($address)) {
@@ -91,32 +89,32 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                 $search, $replace, $body
                 );
             if ($body != $bodyReplaced) {
-                $this->_originalBody = $body;
+                $this->originalBody = $body;
                 $message->setBody($bodyReplaced);
             }
 
             foreach ($message->getHeaders()->getAll() as $header) {
                 $body = $header->getFieldBodyModel();
                 $count = 0;
-                if (is_array($body)) {
-                    $bodyReplaced = array();
+                if (\is_array($body)) {
+                    $bodyReplaced = [];
                     foreach ($body as $key => $value) {
                         $count1 = 0;
                         $count2 = 0;
-                        $key = is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
-                        $value = is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
+                        $key = \is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
+                        $value = \is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
                         $bodyReplaced[$key] = $value;
 
                         if (!$count && ($count1 || $count2)) {
                             $count = 1;
                         }
                     }
-                } else {
+                } elseif (\is_string($body)) {
                     $bodyReplaced = str_replace($search, $replace, $body, $count);
                 }
 
                 if ($count) {
-                    $this->_originalHeaders[$header->getFieldName()] = $body;
+                    $this->originalHeaders[$header->getFieldName()] = $body;
                     $header->setFieldBodyModel($bodyReplaced);
                 }
             }
@@ -131,11 +129,11 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                         );
                     if ($body != $bodyReplaced) {
                         $child->setBody($bodyReplaced);
-                        $this->_originalChildBodies[$child->getId()] = $body;
+                        $this->originalChildBodies[$child->getId()] = $body;
                     }
                 }
             }
-            $this->_lastMessage = $message;
+            $this->lastMessage = $message;
         }
     }
 
@@ -155,50 +153,48 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
      */
     public function getReplacementsFor($address)
     {
-        if ($this->_replacements instanceof Swift_Plugins_Decorator_Replacements) {
-            return $this->_replacements->getReplacementsFor($address);
+        if ($this->replacements instanceof Swift_Plugins_Decorator_Replacements) {
+            return $this->replacements->getReplacementsFor($address);
         }
 
-        return isset($this->_replacements[$address]) ? $this->_replacements[$address] : null;
+        return $this->replacements[$address] ?? null;
     }
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
-        $this->_restoreMessage($evt->getMessage());
+        $this->restoreMessage($evt->getMessage());
     }
 
     /** Restore a changed message back to its original state */
-    private function _restoreMessage(Swift_Mime_Message $message)
+    private function restoreMessage(Swift_Mime_SimpleMessage $message)
     {
-        if ($this->_lastMessage === $message) {
-            if (isset($this->_originalBody)) {
-                $message->setBody($this->_originalBody);
-                $this->_originalBody = null;
+        if ($this->lastMessage === $message) {
+            if (isset($this->originalBody)) {
+                $message->setBody($this->originalBody);
+                $this->originalBody = null;
             }
-            if (!empty($this->_originalHeaders)) {
+            if (!empty($this->originalHeaders)) {
                 foreach ($message->getHeaders()->getAll() as $header) {
-                    if (array_key_exists($header->getFieldName(), $this->_originalHeaders)) {
-                        $header->setFieldBodyModel($this->_originalHeaders[$header->getFieldName()]);
+                    if (\array_key_exists($header->getFieldName(), $this->originalHeaders)) {
+                        $header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
                     }
                 }
-                $this->_originalHeaders = array();
+                $this->originalHeaders = [];
             }
-            if (!empty($this->_originalChildBodies)) {
+            if (!empty($this->originalChildBodies)) {
                 $children = (array) $message->getChildren();
                 foreach ($children as $child) {
                     $id = $child->getId();
-                    if (array_key_exists($id, $this->_originalChildBodies)) {
-                        $child->setBody($this->_originalChildBodies[$id]);
+                    if (\array_key_exists($id, $this->originalChildBodies)) {
+                        $child->setBody($this->originalChildBodies[$id]);
                     }
                 }
-                $this->_originalChildBodies = array();
+                $this->originalChildBodies = [];
             }
-            $this->_lastMessage = null;
+            $this->lastMessage = null;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index 583444053..3f4dbbfa4 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -20,7 +20,7 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
      *
      * @var string
      */
-    private $_sender;
+    private $sender;
 
     /**
      * Create a new ImpersonatePlugin to impersonate $sender.
@@ -29,13 +29,11 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
      */
     public function __construct($sender)
     {
-        $this->_sender = $sender;
+        $this->sender = $sender;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -46,13 +44,11 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
         $headers->addPathHeader('X-Swift-Return-Path', $message->getReturnPath());
 
         // replace them with the one to send to
-        $message->setReturnPath($this->_sender);
+        $message->setReturnPath($this->sender);
     }
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
index 64db43846..e183749b7 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
@@ -11,21 +11,19 @@
 /**
  * Does real time logging of Transport level information.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_Events_ResponseListener, Swift_Events_TransportChangeListener, Swift_Events_TransportExceptionListener, Swift_Plugins_Logger
 {
     /** The logger which is delegated to */
-    private $_logger;
+    private $logger;
 
     /**
      * Create a new LoggerPlugin using $logger.
-     *
-     * @param Swift_Plugins_Logger $logger
      */
     public function __construct(Swift_Plugins_Logger $logger)
     {
-        $this->_logger = $logger;
+        $this->logger = $logger;
     }
 
     /**
@@ -35,7 +33,7 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
      */
     public function add($entry)
     {
-        $this->_logger->add($entry);
+        $this->logger->add($entry);
     }
 
     /**
@@ -43,7 +41,7 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
      */
     public function clear()
     {
-        $this->_logger->clear();
+        $this->logger->clear();
     }
 
     /**
@@ -53,89 +51,75 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
      */
     public function dump()
     {
-        return $this->_logger->dump();
+        return $this->logger->dump();
     }
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
         $command = $evt->getCommand();
-        $this->_logger->add(sprintf('>> %s', $command));
+        $this->logger->add(sprintf('>> %s', $command));
     }
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
         $response = $evt->getResponse();
-        $this->_logger->add(sprintf('<< %s', $response));
+        $this->logger->add(sprintf('<< %s', $response));
     }
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ Starting %s', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ Starting %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ %s started', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ %s started', $transportName));
     }
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ Stopping %s', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ Stopping %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ %s stopped', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ %s stopped', $transportName));
     }
 
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
     {
         $e = $evt->getException();
         $message = $e->getMessage();
         $code = $e->getCode();
-        $this->_logger->add(sprintf('!! %s (code: %s)', $message, $code));
+        $this->logger->add(sprintf('!! %s (code: %s)', $message, $code));
         $message .= PHP_EOL;
         $message .= 'Log data:'.PHP_EOL;
-        $message .= $this->_logger->dump();
+        $message .= $this->logger->dump();
         $evt->cancelBubble();
         throw new Swift_TransportException($message, $code, $e->getPrevious());
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
index 865bb0aa3..6f595adaa 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -20,14 +20,14 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      *
      * @var array
      */
-    private $_log = array();
+    private $log = [];
 
     /**
      * Max size of the log.
      *
      * @var int
      */
-    private $_size = 0;
+    private $size = 0;
 
     /**
      * Create a new ArrayLogger with a maximum of $size entries.
@@ -36,7 +36,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function __construct($size = 50)
     {
-        $this->_size = $size;
+        $this->size = $size;
     }
 
     /**
@@ -46,9 +46,9 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function add($entry)
     {
-        $this->_log[] = $entry;
-        while (count($this->_log) > $this->_size) {
-            array_shift($this->_log);
+        $this->log[] = $entry;
+        while (\count($this->log) > $this->size) {
+            array_shift($this->log);
         }
     }
 
@@ -57,7 +57,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function clear()
     {
-        $this->_log = array();
+        $this->log = [];
     }
 
     /**
@@ -67,6 +67,6 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function dump()
     {
-        return implode(PHP_EOL, $this->_log);
+        return implode(PHP_EOL, $this->log);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
index 3583297ab..40a53d2bb 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
@@ -16,7 +16,7 @@
 class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
 {
     /** Whether or not HTML should be output */
-    private $_isHtml;
+    private $isHtml;
 
     /**
      * Create a new EchoLogger.
@@ -25,7 +25,7 @@ class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
      */
     public function __construct($isHtml = true)
     {
-        $this->_isHtml = $isHtml;
+        $this->isHtml = $isHtml;
     }
 
     /**
@@ -35,7 +35,7 @@ class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
      */
     public function add($entry)
     {
-        if ($this->_isHtml) {
+        if ($this->isHtml) {
             printf('%s%s%s', htmlspecialchars($entry, ENT_QUOTES), '<br />', PHP_EOL);
         } else {
             printf('%s%s', $entry, PHP_EOL);
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index 5ff1d9321..39c48ed18 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,19 +16,19 @@
 class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 {
     /**
-     * @var Swift_Mime_Message[]
+     * @var Swift_Mime_SimpleMessage[]
      */
     private $messages;
 
     public function __construct()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Get the message list.
      *
-     * @return Swift_Mime_Message[]
+     * @return Swift_Mime_SimpleMessage[]
      */
     public function getMessages()
     {
@@ -42,7 +42,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function countMessages()
     {
-        return count($this->messages);
+        return \count($this->messages);
     }
 
     /**
@@ -50,13 +50,11 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function clear()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -65,8 +63,6 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index 31461526c..944859409 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -11,87 +11,70 @@
 /**
  * Makes sure a connection to a POP3 host has been established prior to connecting to SMTP.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection
 {
     /** A delegate connection to use (mostly a test hook) */
-    private $_connection;
+    private $connection;
 
     /** Hostname of the POP3 server */
-    private $_host;
+    private $host;
 
     /** Port number to connect on */
-    private $_port;
+    private $port;
 
     /** Encryption type to use (if any) */
-    private $_crypto;
+    private $crypto;
 
     /** Username to use (if any) */
-    private $_username;
+    private $username;
 
     /** Password to use (if any) */
-    private $_password;
+    private $password;
 
     /** Established connection via TCP socket */
-    private $_socket;
+    private $socket;
 
     /** Connect timeout in seconds */
-    private $_timeout = 10;
+    private $timeout = 10;
 
     /** SMTP Transport to bind to */
-    private $_transport;
+    private $transport;
 
     /**
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
-     * @param string $host
+     * @param string $host   Hostname or IP. Literal IPv6 addresses should be
+     *                       wrapped in square brackets.
      * @param int    $port
      * @param string $crypto as "tls" or "ssl"
      */
     public function __construct($host, $port = 110, $crypto = null)
     {
-        $this->_host = $host;
-        $this->_port = $port;
-        $this->_crypto = $crypto;
-    }
-
-    /**
-     * Create a new PopBeforeSmtpPlugin for $host and $port.
-     *
-     * @param string $host
-     * @param int    $port
-     * @param string $crypto as "tls" or "ssl"
-     *
-     * @return self
-     */
-    public static function newInstance($host, $port = 110, $crypto = null)
-    {
-        return new self($host, $port, $crypto);
+        $this->host = $host;
+        $this->port = $port;
+        $this->crypto = $crypto;
     }
 
     /**
      * Set a Pop3Connection to delegate to instead of connecting directly.
      *
-     * @param Swift_Plugins_Pop_Pop3Connection $connection
-     *
      * @return $this
      */
     public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
     {
-        $this->_connection = $connection;
+        $this->connection = $connection;
 
         return $this;
     }
 
     /**
      * Bind this plugin to a specific SMTP transport instance.
-     *
-     * @param Swift_Transport
      */
     public function bindSmtp(Swift_Transport $smtp)
     {
-        $this->_transport = $smtp;
+        $this->transport = $smtp;
     }
 
     /**
@@ -103,7 +86,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function setTimeout($timeout)
     {
-        $this->_timeout = (int) $timeout;
+        $this->timeout = (int) $timeout;
 
         return $this;
     }
@@ -117,7 +100,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function setUsername($username)
     {
-        $this->_username = $username;
+        $this->username = $username;
 
         return $this;
     }
@@ -131,7 +114,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function setPassword($password)
     {
-        $this->_password = $password;
+        $this->password = $password;
 
         return $this;
     }
@@ -143,29 +126,25 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function connect()
     {
-        if (isset($this->_connection)) {
-            $this->_connection->connect();
+        if (isset($this->connection)) {
+            $this->connection->connect();
         } else {
-            if (!isset($this->_socket)) {
+            if (!isset($this->socket)) {
                 if (!$socket = fsockopen(
-                    $this->_getHostString(), $this->_port, $errno, $errstr, $this->_timeout)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]: %s', $this->_host, $errstr)
-                    );
+                    $this->getHostString(), $this->port, $errno, $errstr, $this->timeout)) {
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr));
                 }
-                $this->_socket = $socket;
+                $this->socket = $socket;
 
-                if (false === $greeting = fgets($this->_socket)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
-                    );
+                if (false === $greeting = fgets($this->socket)) {
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
                 }
 
-                $this->_assertOk($greeting);
+                $this->assertOk($greeting);
 
-                if ($this->_username) {
-                    $this->_command(sprintf("USER %s\r\n", $this->_username));
-                    $this->_command(sprintf("PASS %s\r\n", $this->_password));
+                if ($this->username) {
+                    $this->command(sprintf("USER %s\r\n", $this->username));
+                    $this->command(sprintf("PASS %s\r\n", $this->password));
                 }
             }
         }
@@ -176,28 +155,24 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function disconnect()
     {
-        if (isset($this->_connection)) {
-            $this->_connection->disconnect();
+        if (isset($this->connection)) {
+            $this->connection->disconnect();
         } else {
-            $this->_command("QUIT\r\n");
-            if (!fclose($this->_socket)) {
-                throw new Swift_Plugins_Pop_Pop3Exception(
-                    sprintf('POP3 host [%s] connection could not be stopped', $this->_host)
-                );
+            $this->command("QUIT\r\n");
+            if (!fclose($this->socket)) {
+                throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 host [%s] connection could not be stopped', $this->host));
             }
-            $this->_socket = null;
+            $this->socket = null;
         }
     }
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        if (isset($this->_transport)) {
-            if ($this->_transport !== $evt->getTransport()) {
+        if (isset($this->transport)) {
+            if ($this->transport !== $evt->getTransport()) {
                 return;
             }
         }
@@ -227,38 +202,32 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     {
     }
 
-    private function _command($command)
+    private function command($command)
     {
-        if (!fwrite($this->_socket, $command)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to write command [%s] to POP3 host', trim($command))
-            );
+        if (!fwrite($this->socket, $command)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
         }
 
-        if (false === $response = fgets($this->_socket)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to read from POP3 host after command [%s]', trim($command))
-            );
+        if (false === $response = fgets($this->socket)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
         }
 
-        $this->_assertOk($response);
+        $this->assertOk($response);
 
         return $response;
     }
 
-    private function _assertOk($response)
+    private function assertOk($response)
     {
-        if (substr($response, 0, 3) != '+OK') {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('POP3 command failed [%s]', trim($response))
-            );
+        if ('+OK' != substr($response, 0, 3)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
         }
     }
 
-    private function _getHostString()
+    private function getHostString()
     {
-        $host = $this->_host;
-        switch (strtolower($this->_crypto)) {
+        $host = $this->host;
+        switch (strtolower($this->crypto ?? '')) {
             case 'ssl':
                 $host = 'ssl://'.$host;
                 break;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
index c3a1f8685..f7373b242 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
@@ -11,7 +11,7 @@
 /**
  * Redirects all email to a single recipient.
  *
- * @author Fabien Potencier
+ * @author     Fabien Potencier
  */
 class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 {
@@ -20,25 +20,24 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      *
      * @var mixed
      */
-    private $_recipient;
+    private $recipient;
 
     /**
      * List of regular expression for recipient whitelisting.
      *
      * @var array
      */
-    private $_whitelist = array();
+    private $whitelist = [];
 
     /**
      * Create a new RedirectingPlugin.
      *
      * @param mixed $recipient
-     * @param array $whitelist
      */
-    public function __construct($recipient, array $whitelist = array())
+    public function __construct($recipient, array $whitelist = [])
     {
-        $this->_recipient = $recipient;
-        $this->_whitelist = $whitelist;
+        $this->recipient = $recipient;
+        $this->whitelist = $whitelist;
     }
 
     /**
@@ -48,7 +47,7 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      */
     public function setRecipient($recipient)
     {
-        $this->_recipient = $recipient;
+        $this->recipient = $recipient;
     }
 
     /**
@@ -58,17 +57,15 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      */
     public function getRecipient()
     {
-        return $this->_recipient;
+        return $this->recipient;
     }
 
     /**
      * Set a list of regular expressions to whitelist certain recipients.
-     *
-     * @param array $whitelist
      */
     public function setWhitelist(array $whitelist)
     {
-        $this->_whitelist = $whitelist;
+        $this->whitelist = $whitelist;
     }
 
     /**
@@ -78,13 +75,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      */
     public function getWhitelist()
     {
-        return $this->_whitelist;
+        return $this->whitelist;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -106,18 +101,18 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
         }
 
         // Filter remaining headers against whitelist
-        $this->_filterHeaderSet($headers, 'To');
-        $this->_filterHeaderSet($headers, 'Cc');
-        $this->_filterHeaderSet($headers, 'Bcc');
+        $this->filterHeaderSet($headers, 'To');
+        $this->filterHeaderSet($headers, 'Cc');
+        $this->filterHeaderSet($headers, 'Bcc');
 
         // Add each hard coded recipient
         $to = $message->getTo();
         if (null === $to) {
-            $to = array();
+            $to = [];
         }
 
-        foreach ((array) $this->_recipient as $recipient) {
-            if (!array_key_exists($recipient, $to)) {
+        foreach ((array) $this->recipient as $recipient) {
+            if (!\array_key_exists($recipient, $to)) {
                 $message->addTo($recipient);
             }
         }
@@ -126,29 +121,26 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filter header set against a whitelist of regular expressions.
      *
-     * @param Swift_Mime_HeaderSet $headerSet
-     * @param string               $type
+     * @param string $type
      */
-    private function _filterHeaderSet(Swift_Mime_HeaderSet $headerSet, $type)
+    private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
     {
         foreach ($headerSet->getAll($type) as $headers) {
-            $headers->setNameAddresses($this->_filterNameAddresses($headers->getNameAddresses()));
+            $headers->setNameAddresses($this->filterNameAddresses($headers->getNameAddresses()));
         }
     }
 
     /**
      * Filtered list of addresses => name pairs.
      *
-     * @param array $recipients
-     *
      * @return array
      */
-    private function _filterNameAddresses(array $recipients)
+    private function filterNameAddresses(array $recipients)
     {
-        $filtered = array();
+        $filtered = [];
 
         foreach ($recipients as $address => $name) {
-            if ($this->_isWhitelisted($address)) {
+            if ($this->isWhitelisted($address)) {
                 $filtered[$address] = $name;
             }
         }
@@ -159,17 +151,15 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Matches address against whitelist of regular expressions.
      *
-     * @param $recipient
-     *
      * @return bool
      */
-    protected function _isWhitelisted($recipient)
+    protected function isWhitelisted($recipient)
     {
-        if (in_array($recipient, (array) $this->_recipient)) {
+        if (\in_array($recipient, (array) $this->recipient)) {
             return true;
         }
 
-        foreach ($this->_whitelist as $pattern) {
+        foreach ($this->whitelist as $pattern) {
             if (preg_match($pattern, $recipient)) {
                 return true;
             }
@@ -180,15 +170,13 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
-        $this->_restoreMessage($evt->getMessage());
+        $this->restoreMessage($evt->getMessage());
     }
 
-    private function _restoreMessage(Swift_Mime_Message $message)
+    private function restoreMessage(Swift_Mime_SimpleMessage $message)
     {
         // restore original headers
         $headers = $message->getHeaders();
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
index 0f21b7d60..b88183397 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
@@ -24,9 +24,8 @@ interface Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_Message $message
-     * @param string             $address
-     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
-    public function notify(Swift_Mime_Message $message, $address, $result);
+    public function notify(Swift_Mime_SimpleMessage $message, $address, $result);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
index a37901ff0..c4a016520 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
@@ -20,16 +20,14 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
      *
      * @var Swift_Plugins_Reporter
      */
-    private $_reporter;
+    private $reporter;
 
     /**
      * Create a new ReporterPlugin using $reporter.
-     *
-     * @param Swift_Plugins_Reporter $reporter
      */
     public function __construct(Swift_Plugins_Reporter $reporter)
     {
-        $this->_reporter = $reporter;
+        $this->reporter = $reporter;
     }
 
     /**
@@ -41,21 +39,19 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
         $message = $evt->getMessage();
         $failures = array_flip($evt->getFailedRecipients());
         foreach ((array) $message->getTo() as $address => $null) {
-            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getCc() as $address => $null) {
-            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getBcc() as $address => $null) {
-            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
index cad9d168e..249cffbde 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -20,22 +20,21 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      *
      * @var array
      */
-    private $_failures = array();
+    private $failures = [];
 
-    private $_failures_cache = array();
+    private $failures_cache = [];
 
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_Message $message
-     * @param string             $address
-     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
-    public function notify(Swift_Mime_Message $message, $address, $result)
+    public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
-        if (self::RESULT_FAIL == $result && !isset($this->_failures_cache[$address])) {
-            $this->_failures[] = $address;
-            $this->_failures_cache[$address] = true;
+        if (self::RESULT_FAIL == $result && !isset($this->failures_cache[$address])) {
+            $this->failures[] = $address;
+            $this->failures_cache[$address] = true;
         }
     }
 
@@ -46,7 +45,7 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function getFailedRecipients()
     {
-        return $this->_failures;
+        return $this->failures;
     }
 
     /**
@@ -54,6 +53,6 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function clear()
     {
-        $this->_failures = $this->_failures_cache = array();
+        $this->failures = $this->failures_cache = [];
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
index c62593557..1cfc3f974 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -18,11 +18,10 @@ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_Message $message
-     * @param string             $address
-     * @param int                $result  from {@see RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
      */
-    public function notify(Swift_Mime_Message $message, $address, $result)
+    public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
         if (self::RESULT_PASS == $result) {
             echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 2f4b9a75e..83d304492 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -29,28 +29,28 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @var Swift_Plugins_Sleeper
      */
-    private $_sleeper;
+    private $sleeper;
 
     /**
      * The Timer instance which provides the timestamp.
      *
      * @var Swift_Plugins_Timer
      */
-    private $_timer;
+    private $timer;
 
     /**
      * The time at which the first email was sent.
      *
      * @var int
      */
-    private $_start;
+    private $start;
 
     /**
      * The rate at which messages should be sent.
      *
      * @var int
      */
-    private $_rate;
+    private $rate;
 
     /**
      * The mode for throttling.
@@ -59,53 +59,51 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @var int
      */
-    private $_mode;
+    private $mode;
 
     /**
      * An internal counter of the number of messages sent.
      *
      * @var int
      */
-    private $_messages = 0;
+    private $messages = 0;
 
     /**
      * Create a new ThrottlerPlugin.
      *
      * @param int                   $rate
-     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param int                   $mode    defaults to {@link BYTES_PER_MINUTE}
      * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
      * @param Swift_Plugins_Timer   $timer   (only needed in testing)
      */
     public function __construct($rate, $mode = self::BYTES_PER_MINUTE, Swift_Plugins_Sleeper $sleeper = null, Swift_Plugins_Timer $timer = null)
     {
-        $this->_rate = $rate;
-        $this->_mode = $mode;
-        $this->_sleeper = $sleeper;
-        $this->_timer = $timer;
+        $this->rate = $rate;
+        $this->mode = $mode;
+        $this->sleeper = $sleeper;
+        $this->timer = $timer;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
         $time = $this->getTimestamp();
-        if (!isset($this->_start)) {
-            $this->_start = $time;
+        if (!isset($this->start)) {
+            $this->start = $time;
         }
-        $duration = $time - $this->_start;
+        $duration = $time - $this->start;
 
-        switch ($this->_mode) {
+        switch ($this->mode) {
             case self::BYTES_PER_MINUTE:
-                $sleep = $this->_throttleBytesPerMinute($duration);
+                $sleep = $this->throttleBytesPerMinute($duration);
                 break;
             case self::MESSAGES_PER_SECOND:
-                $sleep = $this->_throttleMessagesPerSecond($duration);
+                $sleep = $this->throttleMessagesPerSecond($duration);
                 break;
             case self::MESSAGES_PER_MINUTE:
-                $sleep = $this->_throttleMessagesPerMinute($duration);
+                $sleep = $this->throttleMessagesPerMinute($duration);
                 break;
             default:
                 $sleep = 0;
@@ -119,13 +117,11 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked when a Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
         parent::sendPerformed($evt);
-        ++$this->_messages;
+        ++$this->messages;
     }
 
     /**
@@ -135,8 +131,8 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      */
     public function sleep($seconds)
     {
-        if (isset($this->_sleeper)) {
-            $this->_sleeper->sleep($seconds);
+        if (isset($this->sleeper)) {
+            $this->sleeper->sleep($seconds);
         } else {
             sleep($seconds);
         }
@@ -149,8 +145,8 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      */
     public function getTimestamp()
     {
-        if (isset($this->_timer)) {
-            return $this->_timer->getTimestamp();
+        if (isset($this->timer)) {
+            return $this->timer->getTimestamp();
         }
 
         return time();
@@ -163,9 +159,9 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @return int
      */
-    private function _throttleBytesPerMinute($timePassed)
+    private function throttleBytesPerMinute($timePassed)
     {
-        $expectedDuration = $this->getBytesOut() / ($this->_rate / 60);
+        $expectedDuration = $this->getBytesOut() / ($this->rate / 60);
 
         return (int) ceil($expectedDuration - $timePassed);
     }
@@ -177,9 +173,9 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @return int
      */
-    private function _throttleMessagesPerSecond($timePassed)
+    private function throttleMessagesPerSecond($timePassed)
     {
-        $expectedDuration = $this->_messages / ($this->_rate);
+        $expectedDuration = $this->messages / $this->rate;
 
         return (int) ceil($expectedDuration - $timePassed);
     }
@@ -191,9 +187,9 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @return int
      */
-    private function _throttleMessagesPerMinute($timePassed)
+    private function throttleMessagesPerMinute($timePassed)
     {
-        $expectedDuration = $this->_messages / ($this->_rate / 60);
+        $expectedDuration = $this->messages / ($this->rate / 60);
 
         return (int) ceil($expectedDuration - $timePassed);
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
index 83cbddcd2..16103e110 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
@@ -16,7 +16,7 @@
 class Swift_Preferences
 {
     /** Singleton instance */
-    private static $_instance = null;
+    private static $instance = null;
 
     /** Constructor not to be used */
     private function __construct()
@@ -30,11 +30,11 @@ class Swift_Preferences
      */
     public static function getInstance()
     {
-        if (!isset(self::$_instance)) {
-            self::$_instance = new self();
+        if (!isset(self::$instance)) {
+            self::$instance = new self();
         }
 
-        return self::$_instance;
+        return self::$instance;
     }
 
     /**
@@ -92,7 +92,7 @@ class Swift_Preferences
         Swift_DependencyContainer::getInstance()
             ->register('mime.qpcontentencoder')
             ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-            ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+            ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
             ->addConstructorValue($dotEscape);
 
         return $this;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
index 47ae7a591..3c756436c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -22,24 +22,12 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
      */
     public function __construct($command = '/usr/sbin/sendmail -bs')
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_SendmailTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SendmailTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.sendmail')
             );
 
         $this->setCommand($command);
     }
-
-    /**
-     * Create a new SendmailTransport instance.
-     *
-     * @param string $command
-     *
-     * @return self
-     */
-    public static function newInstance($command = '/usr/sbin/sendmail -bs')
-    {
-        return new self($command);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php
deleted file mode 100644
index 2e7a8726d..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Signed Message, message that can be signed using a signer.
- *
- * This class is only kept for compatibility
- *
- *
- * @author     Xavier De Cock <xdecock@gmail.com>
- *
- * @deprecated
- */
-class Swift_SignedMessage extends Swift_Message
-{
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
index 2d8176d90..26c5e285c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
@@ -11,7 +11,6 @@
 /**
  * Base Class of Signer Infrastructure.
  *
- *
  * @author Xavier De Cock <xdecock@gmail.com>
  */
 interface Swift_Signer
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
index 8e66e18f4..b25c427af 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
@@ -18,8 +18,6 @@ interface Swift_Signers_BodySigner extends Swift_Signer
     /**
      * Change the Swift_Signed_Message to apply the singing.
      *
-     * @param Swift_Message $message
-     *
      * @return self
      */
     public function signMessage(Swift_Message $message);
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index 454e84b47..ec82dc056 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -11,7 +11,7 @@
 /**
  * DKIM Signer used to apply DKIM Signature to a message.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 {
@@ -20,21 +20,23 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var string
      */
-    protected $_privateKey;
+    protected $privateKey;
 
     /**
      * DomainName.
      *
      * @var string
      */
-    protected $_domainName;
+    protected $domainName;
 
     /**
      * Selector.
      *
      * @var string
      */
-    protected $_selector;
+    protected $selector;
+
+    private $passphrase = '';
 
     /**
      * Hash algorithm used.
@@ -43,63 +45,63 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var string
      */
-    protected $_hashAlgorithm = 'rsa-sha256';
+    protected $hashAlgorithm = 'rsa-sha256';
 
     /**
      * Body canon method.
      *
      * @var string
      */
-    protected $_bodyCanon = 'simple';
+    protected $bodyCanon = 'simple';
 
     /**
      * Header canon method.
      *
      * @var string
      */
-    protected $_headerCanon = 'simple';
+    protected $headerCanon = 'simple';
 
     /**
      * Headers not being signed.
      *
      * @var array
      */
-    protected $_ignoredHeaders = array('return-path' => true);
+    protected $ignoredHeaders = ['return-path' => true];
 
     /**
      * Signer identity.
      *
      * @var string
      */
-    protected $_signerIdentity;
+    protected $signerIdentity;
 
     /**
      * BodyLength.
      *
      * @var int
      */
-    protected $_bodyLen = 0;
+    protected $bodyLen = 0;
 
     /**
      * Maximum signedLen.
      *
      * @var int
      */
-    protected $_maxLen = PHP_INT_MAX;
+    protected $maxLen = PHP_INT_MAX;
 
     /**
      * Embbed bodyLen in signature.
      *
      * @var bool
      */
-    protected $_showLen = false;
+    protected $showLen = false;
 
     /**
      * When the signature has been applied (true means time()), false means not embedded.
      *
      * @var mixed
      */
-    protected $_signatureTimestamp = true;
+    protected $signatureTimestamp = true;
 
     /**
      * When will the signature expires false means not embedded, if sigTimestamp is auto
@@ -107,14 +109,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var int
      */
-    protected $_signatureExpiration = false;
+    protected $signatureExpiration = false;
 
     /**
      * Must we embed signed headers?
      *
      * @var bool
      */
-    protected $_debugHeaders = false;
+    protected $debugHeaders = false;
 
     // work variables
     /**
@@ -122,46 +124,46 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $_signedHeaders = array();
+    protected $signedHeaders = [];
 
     /**
      * If debugHeaders is set store debugData here.
      *
-     * @var string
+     * @var string[]
      */
-    private $_debugHeadersData = '';
+    private $debugHeadersData = [];
 
     /**
      * Stores the bodyHash.
      *
      * @var string
      */
-    private $_bodyHash = '';
+    private $bodyHash = '';
 
     /**
      * Stores the signature header.
      *
      * @var Swift_Mime_Headers_ParameterizedHeader
      */
-    protected $_dkimHeader;
+    protected $dkimHeader;
 
-    private $_bodyHashHandler;
+    private $bodyHashHandler;
 
-    private $_headerHash;
+    private $headerHash;
 
-    private $_headerCanonData = '';
+    private $headerCanonData = '';
 
-    private $_bodyCanonEmptyCounter = 0;
+    private $bodyCanonEmptyCounter = 0;
 
-    private $_bodyCanonIgnoreStart = 2;
+    private $bodyCanonIgnoreStart = 2;
 
-    private $_bodyCanonSpace = false;
+    private $bodyCanonSpace = false;
 
-    private $_bodyCanonLastChar = null;
+    private $bodyCanonLastChar = null;
 
-    private $_bodyCanonLine = '';
+    private $bodyCanonLine = '';
 
-    private $_bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -169,32 +171,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      * @param string $privateKey
      * @param string $domainName
      * @param string $selector
+     * @param string $passphrase
      */
-    public function __construct($privateKey, $domainName, $selector)
+    public function __construct($privateKey, $domainName, $selector, $passphrase = '')
     {
-        $this->_privateKey = $privateKey;
-        $this->_domainName = $domainName;
-        $this->_signerIdentity = '@'.$domainName;
-        $this->_selector = $selector;
-
-        // keep fallback hash algorithm sha1 if php version is lower than 5.4.8
-        if (PHP_VERSION_ID < 50408) {
-            $this->_hashAlgorithm = 'rsa-sha1';
-        }
-    }
-
-    /**
-     * Instanciate DKIMSigner.
-     *
-     * @param string $privateKey
-     * @param string $domainName
-     * @param string $selector
-     *
-     * @return self
-     */
-    public static function newInstance($privateKey, $domainName, $selector)
-    {
-        return new static($privateKey, $domainName, $selector);
+        $this->privateKey = $privateKey;
+        $this->domainName = $domainName;
+        $this->signerIdentity = '@'.$domainName;
+        $this->selector = $selector;
+        $this->passphrase = $passphrase;
     }
 
     /**
@@ -204,14 +189,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->_headerHash = null;
-        $this->_signedHeaders = array();
-        $this->_bodyHash = null;
-        $this->_bodyHashHandler = null;
-        $this->_bodyCanonIgnoreStart = 2;
-        $this->_bodyCanonEmptyCounter = 0;
-        $this->_bodyCanonLastChar = null;
-        $this->_bodyCanonSpace = false;
+        $this->headerHash = null;
+        $this->signedHeaders = [];
+        $this->bodyHash = null;
+        $this->bodyHashHandler = null;
+        $this->bodyCanonIgnoreStart = 2;
+        $this->bodyCanonEmptyCounter = 0;
+        $this->bodyCanonLastChar = null;
+        $this->bodyCanonSpace = false;
     }
 
     /**
@@ -226,15 +211,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @param string $bytes
      *
-     * @throws Swift_IoException
-     *
      * @return int
+     *
+     * @throws Swift_IoException
      */
     // TODO fix return
     public function write($bytes)
     {
-        $this->_canonicalizeBody($bytes);
-        foreach ($this->_bound as $is) {
+        $this->canonicalizeBody($bytes);
+        foreach ($this->bound as $is) {
             $is->write($bytes);
         }
     }
@@ -251,33 +236,31 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        $this->_bound[] = $is;
+        $this->bound[] = $is;
 
         return;
     }
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        foreach ($this->_bound as $k => $stream) {
+        foreach ($this->bound as $k => $stream) {
             if ($stream === $is) {
-                unset($this->_bound[$k]);
+                unset($this->bound[$k]);
 
                 return;
             }
@@ -308,11 +291,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     {
         switch ($hash) {
             case 'rsa-sha1':
-                $this->_hashAlgorithm = 'rsa-sha1';
+                $this->hashAlgorithm = 'rsa-sha1';
                 break;
             case 'rsa-sha256':
-                $this->_hashAlgorithm = 'rsa-sha256';
-                if (!defined('OPENSSL_ALGO_SHA256')) {
+                $this->hashAlgorithm = 'rsa-sha256';
+                if (!\defined('OPENSSL_ALGO_SHA256')) {
                     throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
                 }
                 break;
@@ -332,10 +315,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodyCanon($canon)
     {
-        if ($canon == 'relaxed') {
-            $this->_bodyCanon = 'relaxed';
+        if ('relaxed' == $canon) {
+            $this->bodyCanon = 'relaxed';
         } else {
-            $this->_bodyCanon = 'simple';
+            $this->bodyCanon = 'simple';
         }
 
         return $this;
@@ -350,10 +333,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setHeaderCanon($canon)
     {
-        if ($canon == 'relaxed') {
-            $this->_headerCanon = 'relaxed';
+        if ('relaxed' == $canon) {
+            $this->headerCanon = 'relaxed';
         } else {
-            $this->_headerCanon = 'simple';
+            $this->headerCanon = 'simple';
         }
 
         return $this;
@@ -368,7 +351,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setSignerIdentity($identity)
     {
-        $this->_signerIdentity = $identity;
+        $this->signerIdentity = $identity;
 
         return $this;
     }
@@ -382,15 +365,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodySignedLen($len)
     {
-        if ($len === true) {
-            $this->_showLen = true;
-            $this->_maxLen = PHP_INT_MAX;
-        } elseif ($len === false) {
-            $this->_showLen = false;
-            $this->_maxLen = PHP_INT_MAX;
+        if (true === $len) {
+            $this->showLen = true;
+            $this->maxLen = PHP_INT_MAX;
+        } elseif (false === $len) {
+            $this->showLen = false;
+            $this->maxLen = PHP_INT_MAX;
         } else {
-            $this->_showLen = true;
-            $this->_maxLen = (int) $len;
+            $this->showLen = true;
+            $this->maxLen = (int) $len;
         }
 
         return $this;
@@ -405,7 +388,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setSignatureTimestamp($time)
     {
-        $this->_signatureTimestamp = $time;
+        $this->signatureTimestamp = $time;
 
         return $this;
     }
@@ -419,7 +402,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setSignatureExpiration($time)
     {
-        $this->_signatureExpiration = $time;
+        $this->signatureExpiration = $time;
 
         return $this;
     }
@@ -433,7 +416,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setDebugHeaders($debug)
     {
-        $this->_debugHeaders = (bool) $debug;
+        $this->debugHeaders = (bool) $debug;
 
         return $this;
     }
@@ -444,15 +427,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function startBody()
     {
         // Init
-        switch ($this->_hashAlgorithm) {
+        switch ($this->hashAlgorithm) {
             case 'rsa-sha256':
-                $this->_bodyHashHandler = hash_init('sha256');
+                $this->bodyHashHandler = hash_init('sha256');
                 break;
             case 'rsa-sha1':
-                $this->_bodyHashHandler = hash_init('sha1');
+                $this->bodyHashHandler = hash_init('sha1');
                 break;
         }
-        $this->_bodyCanonLine = '';
+        $this->bodyCanonLine = '';
     }
 
     /**
@@ -460,7 +443,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function endBody()
     {
-        $this->_endOfBody();
+        $this->endOfBody();
     }
 
     /**
@@ -470,10 +453,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function getAlteredHeaders()
     {
-        if ($this->_debugHeaders) {
-            return array('DKIM-Signature', 'X-DebugHash');
+        if ($this->debugHeaders) {
+            return ['DKIM-Signature', 'X-DebugHash'];
         } else {
-            return array('DKIM-Signature');
+            return ['DKIM-Signature'];
         }
     }
 
@@ -486,7 +469,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->_ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -494,24 +477,22 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
-    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $this->_headerCanonData = '';
+        $this->headerCanonData = '';
         // Loop through Headers
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
-                            $this->_addHeader($header->toString());
-                            $this->_signedHeaders[] = $header->getFieldName();
+                        if ('' != $header->getFieldBody()) {
+                            $this->addHeader($header->toString());
+                            $this->signedHeaders[] = $header->getFieldName();
                         }
                     }
                 }
@@ -524,37 +505,35 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
-    public function addSignature(Swift_Mime_HeaderSet $headers)
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DKIM-Signature
-        $params = array('v' => '1', 'a' => $this->_hashAlgorithm, 'bh' => base64_encode($this->_bodyHash), 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'i' => $this->_signerIdentity, 's' => $this->_selector);
-        if ($this->_bodyCanon != 'simple') {
-            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
-        } elseif ($this->_headerCanon != 'simple') {
-            $params['c'] = $this->_headerCanon;
+        $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+        if ('simple' != $this->bodyCanon) {
+            $params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
+        } elseif ('simple' != $this->headerCanon) {
+            $params['c'] = $this->headerCanon;
         }
-        if ($this->_showLen) {
-            $params['l'] = $this->_bodyLen;
+        if ($this->showLen) {
+            $params['l'] = $this->bodyLen;
         }
-        if ($this->_signatureTimestamp === true) {
+        if (true === $this->signatureTimestamp) {
             $params['t'] = time();
-            if ($this->_signatureExpiration !== false) {
-                $params['x'] = $params['t'] + $this->_signatureExpiration;
+            if (false !== $this->signatureExpiration) {
+                $params['x'] = $params['t'] + $this->signatureExpiration;
             }
         } else {
-            if ($this->_signatureTimestamp !== false) {
-                $params['t'] = $this->_signatureTimestamp;
+            if (false !== $this->signatureTimestamp) {
+                $params['t'] = $this->signatureTimestamp;
             }
-            if ($this->_signatureExpiration !== false) {
-                $params['x'] = $this->_signatureExpiration;
+            if (false !== $this->signatureExpiration) {
+                $params['x'] = $this->signatureExpiration;
             }
         }
-        if ($this->_debugHeaders) {
-            $params['z'] = implode('|', $this->_debugHeadersData);
+        if ($this->debugHeaders) {
+            $params['z'] = implode('|', $this->debugHeadersData);
         }
         $string = '';
         foreach ($params as $k => $v) {
@@ -564,22 +543,21 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
         $headers->addTextHeader('DKIM-Signature', $string);
         // Add the last DKIM-Signature
         $tmp = $headers->getAll('DKIM-Signature');
-        $this->_dkimHeader = end($tmp);
-        $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true);
-        $this->_endOfHeaders();
-        if ($this->_debugHeaders) {
-            $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash));
+        $this->dkimHeader = end($tmp);
+        $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
+        if ($this->debugHeaders) {
+            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
         }
-        $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
+        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
 
         return $this;
     }
 
     /* Private helpers */
 
-    protected function _addHeader($header, $is_sig = false)
+    protected function addHeader($header, $is_sig = false)
     {
-        switch ($this->_headerCanon) {
+        switch ($this->headerCanon) {
             case 'relaxed':
                 // Prepare Header and cascade
                 $exploded = explode(':', $header, 2);
@@ -587,44 +565,36 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+                // no break
             case 'simple':
                 // Nothing to do
         }
-        $this->_addToHeaderHash($header);
+        $this->addToHeaderHash($header);
     }
 
-    /**
-     * @deprecated This method is currently useless in this class but it must be
-     *             kept for BC reasons due to its "protected" scope. This method
-     *             might be overridden by custom client code.
-     */
-    protected function _endOfHeaders()
+    protected function canonicalizeBody($string)
     {
-    }
-
-    protected function _canonicalizeBody($string)
-    {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $method = ($this->_bodyCanon == 'relaxed');
+        $method = ('relaxed' == $this->bodyCanon);
         for ($i = 0; $i < $len; ++$i) {
-            if ($this->_bodyCanonIgnoreStart > 0) {
-                --$this->_bodyCanonIgnoreStart;
+            if ($this->bodyCanonIgnoreStart > 0) {
+                --$this->bodyCanonIgnoreStart;
                 continue;
             }
             switch ($string[$i]) {
                 case "\r":
-                    $this->_bodyCanonLastChar = "\r";
+                    $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->_bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($method) {
-                            $this->_bodyCanonSpace = false;
+                            $this->bodyCanonSpace = false;
                         }
-                        if ($this->_bodyCanonLine == '') {
-                            ++$this->_bodyCanonEmptyCounter;
+                        if ('' == $this->bodyCanonLine) {
+                            ++$this->bodyCanonEmptyCounter;
                         } else {
-                            $this->_bodyCanonLine = '';
+                            $this->bodyCanonLine = '';
                             $canon .= "\r\n";
                         }
                     } else {
@@ -635,52 +605,53 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 case ' ':
                 case "\t":
                     if ($method) {
-                        $this->_bodyCanonSpace = true;
+                        $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
-                    if ($this->_bodyCanonEmptyCounter > 0) {
-                        $canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
-                        $this->_bodyCanonEmptyCounter = 0;
+                    if ($this->bodyCanonEmptyCounter > 0) {
+                        $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
+                        $this->bodyCanonEmptyCounter = 0;
                     }
-                    if ($this->_bodyCanonSpace) {
-                        $this->_bodyCanonLine .= ' ';
+                    if ($this->bodyCanonSpace) {
+                        $this->bodyCanonLine .= ' ';
                         $canon .= ' ';
-                        $this->_bodyCanonSpace = false;
+                        $this->bodyCanonSpace = false;
                     }
-                    $this->_bodyCanonLine .= $string[$i];
+                    $this->bodyCanonLine .= $string[$i];
                     $canon .= $string[$i];
             }
         }
-        $this->_addToBodyHash($canon);
+        $this->addToBodyHash($canon);
     }
 
-    protected function _endOfBody()
+    protected function endOfBody()
     {
         // Add trailing Line return if last line is non empty
-        if (strlen($this->_bodyCanonLine) > 0) {
-            $this->_addToBodyHash("\r\n");
+        if (\strlen($this->bodyCanonLine) > 0) {
+            $this->addToBodyHash("\r\n");
         }
-        $this->_bodyHash = hash_final($this->_bodyHashHandler, true);
+        $this->bodyHash = hash_final($this->bodyHashHandler, true);
     }
 
-    private function _addToBodyHash($string)
+    private function addToBodyHash($string)
     {
-        $len = strlen($string);
-        if ($len > ($new_len = ($this->_maxLen - $this->_bodyLen))) {
+        $len = \strlen($string);
+        if ($len > ($new_len = ($this->maxLen - $this->bodyLen))) {
             $string = substr($string, 0, $new_len);
             $len = $new_len;
         }
-        hash_update($this->_bodyHashHandler, $string);
-        $this->_bodyLen += $len;
+        hash_update($this->bodyHashHandler, $string);
+        $this->bodyLen += $len;
     }
 
-    private function _addToHeaderHash($header)
+    private function addToHeaderHash($header)
     {
-        if ($this->_debugHeaders) {
-            $this->_debugHeadersData[] = trim($header);
+        if ($this->debugHeaders) {
+            $this->debugHeadersData[] = trim($header ?? '');
         }
-        $this->_headerCanonData .= $header;
+        $this->headerCanonData .= $header;
     }
 
     /**
@@ -688,11 +659,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @return string
      */
-    private function _getEncryptedHash()
+    private function getEncryptedHash()
     {
         $signature = '';
-
-        switch ($this->_hashAlgorithm) {
+        switch ($this->hashAlgorithm) {
             case 'rsa-sha1':
                 $algorithm = OPENSSL_ALGO_SHA1;
                 break;
@@ -700,11 +670,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $algorithm = OPENSSL_ALGO_SHA256;
                 break;
         }
-        $pkeyId = openssl_get_privatekey($this->_privateKey);
+        $pkeyId = openssl_get_privatekey($this->privateKey, $this->passphrase);
         if (!$pkeyId) {
             throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
         }
-        if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) {
+        if (openssl_sign($this->headerCanonData, $signature, $pkeyId, $algorithm)) {
             return $signature;
         }
         throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 0365363c8..5e2b67b65 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -11,7 +11,7 @@
 /**
  * DomainKey Signer used to apply DomainKeys Signature to a message.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 {
@@ -20,56 +20,56 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var string
      */
-    protected $_privateKey;
+    protected $privateKey;
 
     /**
      * DomainName.
      *
      * @var string
      */
-    protected $_domainName;
+    protected $domainName;
 
     /**
      * Selector.
      *
      * @var string
      */
-    protected $_selector;
+    protected $selector;
 
     /**
      * Hash algorithm used.
      *
      * @var string
      */
-    protected $_hashAlgorithm = 'rsa-sha1';
+    protected $hashAlgorithm = 'rsa-sha1';
 
     /**
      * Canonisation method.
      *
      * @var string
      */
-    protected $_canon = 'simple';
+    protected $canon = 'simple';
 
     /**
      * Headers not being signed.
      *
      * @var array
      */
-    protected $_ignoredHeaders = array();
+    protected $ignoredHeaders = [];
 
     /**
      * Signer identity.
      *
      * @var string
      */
-    protected $_signerIdentity;
+    protected $signerIdentity;
 
     /**
      * Must we embed signed headers?
      *
      * @var bool
      */
-    protected $_debugHeaders = false;
+    protected $debugHeaders = false;
 
     // work variables
     /**
@@ -77,37 +77,35 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    private $_signedHeaders = array();
+    private $signedHeaders = [];
 
     /**
      * Stores the signature header.
      *
      * @var Swift_Mime_Headers_ParameterizedHeader
      */
-    protected $_domainKeyHeader;
+    protected $domainKeyHeader;
 
     /**
      * Hash Handler.
      *
      * @var resource|null
      */
-    private $_hashHandler;
+    private $hashHandler;
 
-    private $_hash;
+    private $canonData = '';
 
-    private $_canonData = '';
+    private $bodyCanonEmptyCounter = 0;
 
-    private $_bodyCanonEmptyCounter = 0;
+    private $bodyCanonIgnoreStart = 2;
 
-    private $_bodyCanonIgnoreStart = 2;
+    private $bodyCanonSpace = false;
 
-    private $_bodyCanonSpace = false;
+    private $bodyCanonLastChar = null;
 
-    private $_bodyCanonLastChar = null;
+    private $bodyCanonLine = '';
 
-    private $_bodyCanonLine = '';
-
-    private $_bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -118,24 +116,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function __construct($privateKey, $domainName, $selector)
     {
-        $this->_privateKey = $privateKey;
-        $this->_domainName = $domainName;
-        $this->_signerIdentity = '@'.$domainName;
-        $this->_selector = $selector;
-    }
-
-    /**
-     * Instanciate DomainKeySigner.
-     *
-     * @param string $privateKey
-     * @param string $domainName
-     * @param string $selector
-     *
-     * @return self
-     */
-    public static function newInstance($privateKey, $domainName, $selector)
-    {
-        return new static($privateKey, $domainName, $selector);
+        $this->privateKey = $privateKey;
+        $this->domainName = $domainName;
+        $this->signerIdentity = '@'.$domainName;
+        $this->selector = $selector;
     }
 
     /**
@@ -145,12 +129,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->_hash = null;
-        $this->_hashHandler = null;
-        $this->_bodyCanonIgnoreStart = 2;
-        $this->_bodyCanonEmptyCounter = 0;
-        $this->_bodyCanonLastChar = null;
-        $this->_bodyCanonSpace = false;
+        $this->hashHandler = null;
+        $this->bodyCanonIgnoreStart = 2;
+        $this->bodyCanonEmptyCounter = 0;
+        $this->bodyCanonLastChar = null;
+        $this->bodyCanonSpace = false;
 
         return $this;
     }
@@ -167,14 +150,16 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @param string $bytes
      *
+     * @return int
+     *
      * @throws Swift_IoException
      *
      * @return $this
      */
     public function write($bytes)
     {
-        $this->_canonicalizeBody($bytes);
-        foreach ($this->_bound as $is) {
+        $this->canonicalizeBody($bytes);
+        foreach ($this->bound as $is) {
             $is->write($bytes);
         }
 
@@ -197,37 +182,35 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function bind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        $this->_bound[] = $is;
+        $this->bound[] = $is;
 
         return $this;
     }
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function unbind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        foreach ($this->_bound as $k => $stream) {
+        foreach ($this->bound as $k => $stream) {
             if ($stream === $is) {
-                unset($this->_bound[$k]);
+                unset($this->bound[$k]);
 
                 break;
             }
@@ -260,7 +243,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setHashAlgorithm($hash)
     {
-        $this->_hashAlgorithm = 'rsa-sha1';
+        $this->hashAlgorithm = 'rsa-sha1';
 
         return $this;
     }
@@ -274,10 +257,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setCanon($canon)
     {
-        if ($canon == 'nofws') {
-            $this->_canon = 'nofws';
+        if ('nofws' == $canon) {
+            $this->canon = 'nofws';
         } else {
-            $this->_canon = 'simple';
+            $this->canon = 'simple';
         }
 
         return $this;
@@ -292,7 +275,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setSignerIdentity($identity)
     {
-        $this->_signerIdentity = $identity;
+        $this->signerIdentity = $identity;
 
         return $this;
     }
@@ -306,7 +289,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setDebugHeaders($debug)
     {
-        $this->_debugHeaders = (bool) $debug;
+        $this->debugHeaders = (bool) $debug;
 
         return $this;
     }
@@ -323,7 +306,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function endBody()
     {
-        $this->_endOfBody();
+        $this->endOfBody();
     }
 
     /**
@@ -333,11 +316,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function getAlteredHeaders()
     {
-        if ($this->_debugHeaders) {
-            return array('DomainKey-Signature', 'X-DebugHash');
+        if ($this->debugHeaders) {
+            return ['DomainKey-Signature', 'X-DebugHash'];
         }
 
-        return array('DomainKey-Signature');
+        return ['DomainKey-Signature'];
     }
 
     /**
@@ -349,7 +332,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->_ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -357,31 +340,29 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return $this
      */
-    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $this->_startHash();
-        $this->_canonData = '';
+        $this->startHash();
+        $this->canonData = '';
         // Loop through Headers
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
-                            $this->_addHeader($header->toString());
-                            $this->_signedHeaders[] = $header->getFieldName();
+                        if ('' != $header->getFieldBody()) {
+                            $this->addHeader($header->toString());
+                            $this->signedHeaders[] = $header->getFieldName();
                         }
                     }
                 }
             }
         }
-        $this->_endOfHeaders();
+        $this->endOfHeaders();
 
         return $this;
     }
@@ -389,14 +370,12 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return $this
      */
-    public function addSignature(Swift_Mime_HeaderSet $headers)
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DomainKey-Signature Header
-        $params = array('a' => $this->_hashAlgorithm, 'b' => chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '), 'c' => $this->_canon, 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'q' => 'dns', 's' => $this->_selector);
+        $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
         $string = '';
         foreach ($params as $k => $v) {
             $string .= $k.'='.$v.'; ';
@@ -409,9 +388,9 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /* Private helpers */
 
-    protected function _addHeader($header)
+    protected function addHeader($header)
     {
-        switch ($this->_canon) {
+        switch ($this->canon) {
             case 'nofws':
                 // Prepare Header and cascade
                 $exploded = explode(':', $header, 2);
@@ -419,40 +398,41 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value)."\r\n";
+                // no break
             case 'simple':
                 // Nothing to do
         }
-        $this->_addToHash($header);
+        $this->addToHash($header);
     }
 
-    protected function _endOfHeaders()
+    protected function endOfHeaders()
     {
-        $this->_bodyCanonEmptyCounter = 1;
+        $this->bodyCanonEmptyCounter = 1;
     }
 
-    protected function _canonicalizeBody($string)
+    protected function canonicalizeBody($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $nofws = ($this->_canon == 'nofws');
+        $nofws = ('nofws' == $this->canon);
         for ($i = 0; $i < $len; ++$i) {
-            if ($this->_bodyCanonIgnoreStart > 0) {
-                --$this->_bodyCanonIgnoreStart;
+            if ($this->bodyCanonIgnoreStart > 0) {
+                --$this->bodyCanonIgnoreStart;
                 continue;
             }
             switch ($string[$i]) {
                 case "\r":
-                    $this->_bodyCanonLastChar = "\r";
+                    $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->_bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($nofws) {
-                            $this->_bodyCanonSpace = false;
+                            $this->bodyCanonSpace = false;
                         }
-                        if ($this->_bodyCanonLine == '') {
-                            ++$this->_bodyCanonEmptyCounter;
+                        if ('' == $this->bodyCanonLine) {
+                            ++$this->bodyCanonEmptyCounter;
                         } else {
-                            $this->_bodyCanonLine = '';
+                            $this->bodyCanonLine = '';
                             $canon .= "\r\n";
                         }
                     } else {
@@ -464,44 +444,44 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 case "\t":
                 case "\x09": //HTAB
                     if ($nofws) {
-                        $this->_bodyCanonSpace = true;
+                        $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
-                    if ($this->_bodyCanonEmptyCounter > 0) {
-                        $canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
-                        $this->_bodyCanonEmptyCounter = 0;
+                    if ($this->bodyCanonEmptyCounter > 0) {
+                        $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
+                        $this->bodyCanonEmptyCounter = 0;
                     }
-                    $this->_bodyCanonLine .= $string[$i];
+                    $this->bodyCanonLine .= $string[$i];
                     $canon .= $string[$i];
             }
         }
-        $this->_addToHash($canon);
+        $this->addToHash($canon);
     }
 
-    protected function _endOfBody()
+    protected function endOfBody()
     {
-        if (strlen($this->_bodyCanonLine) > 0) {
-            $this->_addToHash("\r\n");
+        if (\strlen($this->bodyCanonLine) > 0) {
+            $this->addToHash("\r\n");
         }
-        $this->_hash = hash_final($this->_hashHandler, true);
     }
 
-    private function _addToHash($string)
+    private function addToHash($string)
     {
-        $this->_canonData .= $string;
-        hash_update($this->_hashHandler, $string);
+        $this->canonData .= $string;
+        hash_update($this->hashHandler, $string);
     }
 
-    private function _startHash()
+    private function startHash()
     {
         // Init
-        switch ($this->_hashAlgorithm) {
+        switch ($this->hashAlgorithm) {
             case 'rsa-sha1':
-                $this->_hashHandler = hash_init('sha1');
+                $this->hashHandler = hash_init('sha1');
                 break;
         }
-        $this->_bodyCanonLine = '';
+        $this->bodyCanonLine = '';
     }
 
     /**
@@ -509,14 +489,14 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @return string
      */
-    private function _getEncryptedHash()
+    private function getEncryptedHash()
     {
         $signature = '';
-        $pkeyId = openssl_get_privatekey($this->_privateKey);
+        $pkeyId = openssl_get_privatekey($this->privateKey);
         if (!$pkeyId) {
             throw new Swift_SwiftException('Unable to load DomainKey Private Key ['.openssl_error_string().']');
         }
-        if (openssl_sign($this->_canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
+        if (openssl_sign($this->canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
             return $signature;
         }
         throw new Swift_SwiftException('Unable to sign DomainKey Hash  ['.openssl_error_string().']');
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
index ef8832fdf..6f5c20923 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
@@ -41,20 +41,16 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
     /**
      * Give the headers already given.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return self
      */
-    public function setHeaders(Swift_Mime_HeaderSet $headers);
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers);
 
     /**
      * Add the header(s) to the headerSet.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return self
      */
-    public function addSignature(Swift_Mime_HeaderSet $headers);
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers);
 
     /**
      * Return the list of header a signer might tamper.
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index 8fdbaa43b..520bcc15e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -12,13 +12,15 @@
  * DKIM Signer used to apply DKIM Signature to a message
  * Takes advantage of pecl extension.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 {
-    private $_peclLoaded = false;
+    private $peclLoaded = false;
 
-    private $_dkimHandler = null;
+    private $dkimHandler = null;
 
     private $dropFirstLF = true;
 
@@ -29,26 +31,21 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function __construct($privateKey, $domainName, $selector)
     {
-        if (!extension_loaded('opendkim')) {
+        if (!\extension_loaded('opendkim')) {
             throw new Swift_SwiftException('php-opendkim extension not found');
         }
 
-        $this->_peclLoaded = true;
+        $this->peclLoaded = true;
 
         parent::__construct($privateKey, $domainName, $selector);
     }
 
-    public static function newInstance($privateKey, $domainName, $selector)
-    {
-        return new static($privateKey, $domainName, $selector);
-    }
-
-    public function addSignature(Swift_Mime_HeaderSet $headers)
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
-        $headerVal = $this->_dkimHandler->getSignatureHeader();
-        if (!$headerVal) {
-            throw new Swift_SwiftException('OpenDKIM Error: '.$this->_dkimHandler->getError());
+        $headerVal = $this->dkimHandler->getSignatureHeader();
+        if (false === $headerVal || \is_int($headerVal)) {
+            throw new Swift_SwiftException('OpenDKIM Error: '.$this->dkimHandler->getError());
         }
         $header->setValue($headerVal);
         $headers->set($header);
@@ -56,40 +53,36 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         return $this;
     }
 
-    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $bodyLen = $this->_bodyLen;
-        if (is_bool($bodyLen)) {
-            $bodyLen = -1;
-        }
-        $hash = $this->_hashAlgorithm == 'rsa-sha1' ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
-        $bodyCanon = $this->_bodyCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $headerCanon = $this->_headerCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $this->_dkimHandler = new OpenDKIMSign($this->_privateKey, $this->_selector, $this->_domainName, $headerCanon, $bodyCanon, $hash, $bodyLen);
+        $hash = 'rsa-sha1' == $this->hashAlgorithm ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
+        $bodyCanon = 'simple' == $this->bodyCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $headerCanon = 'simple' == $this->headerCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, -1);
         // Hardcode signature Margin for now
-        $this->_dkimHandler->setMargin(78);
+        $this->dkimHandler->setMargin(78);
 
-        if (!is_numeric($this->_signatureTimestamp)) {
+        if (!is_numeric($this->signatureTimestamp)) {
             OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time());
         } else {
-            if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) {
+            if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->signatureTimestamp)) {
                 throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']');
             }
         }
-        if (isset($this->_signerIdentity)) {
-            $this->_dkimHandler->setSigner($this->_signerIdentity);
+        if (isset($this->signerIdentity)) {
+            $this->dkimHandler->setSigner($this->signerIdentity);
         }
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 $tmp = $headers->getAll($hName);
                 if ($headers->has($hName)) {
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $htosign = $header->toString();
-                            $this->_dkimHandler->header($htosign);
-                            $this->_signedHeaders[] = $header->getFieldName();
+                            $this->dkimHandler->header($htosign);
+                            $this->signedHeaders[] = $header->getFieldName();
                         }
                     }
                 }
@@ -101,28 +94,28 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function startBody()
     {
-        if (!$this->_peclLoaded) {
+        if (!$this->peclLoaded) {
             return parent::startBody();
         }
         $this->dropFirstLF = true;
-        $this->_dkimHandler->eoh();
+        $this->dkimHandler->eoh();
 
         return $this;
     }
 
     public function endBody()
     {
-        if (!$this->_peclLoaded) {
+        if (!$this->peclLoaded) {
             return parent::endBody();
         }
-        $this->_dkimHandler->eom();
+        $this->dkimHandler->eom();
 
         return $this;
     }
 
     public function reset()
     {
-        $this->_dkimHandler = null;
+        $this->dkimHandler = null;
         parent::reset();
 
         return $this;
@@ -137,7 +130,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
      */
     public function setSignatureTimestamp($time)
     {
-        $this->_signatureTimestamp = $time;
+        $this->signatureTimestamp = $time;
 
         return $this;
     }
@@ -151,7 +144,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
      */
     public function setSignatureExpiration($time)
     {
-        $this->_signatureExpiration = $time;
+        $this->signatureExpiration = $time;
 
         return $this;
     }
@@ -165,26 +158,26 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
      */
     public function setDebugHeaders($debug)
     {
-        $this->_debugHeaders = (bool) $debug;
+        $this->debugHeaders = (bool) $debug;
 
         return $this;
     }
 
     // Protected
 
-    protected function _canonicalizeBody($string)
+    protected function canonicalizeBody($string)
     {
-        if (!$this->_peclLoaded) {
-            return parent::_canonicalizeBody($string);
+        if (!$this->peclLoaded) {
+            return parent::canonicalizeBody($string);
         }
-        if (false && $this->dropFirstLF === true) {
-            if ($string[0] == "\r" && $string[1] == "\n") {
+        if (true === $this->dropFirstLF) {
+            if ("\r" == $string[0] && "\n" == $string[1]) {
                 $string = substr($string, 2);
             }
         }
         $this->dropFirstLF = false;
-        if (strlen($string)) {
-            $this->_dkimHandler->body($string);
+        if (\strlen($string)) {
+            $this->dkimHandler->body($string);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index d13c02e4c..3dd3cd05f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -11,9 +11,9 @@
 /**
  * MIME Message Signer used to apply S/MIME Signature/Encryption to a message.
  *
- *
  * @author Romain-Geissler
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ * @author Jan Flora <jf@penneo.com>
  */
 class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 {
@@ -27,6 +27,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $encryptOptions;
     protected $encryptCipher;
     protected $extraCerts = null;
+    protected $wrapFullMessage = false;
 
     /**
      * @var Swift_StreamFilters_StringReplacementFilterFactory
@@ -34,7 +35,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $replacementFactory;
 
     /**
-     * @var Swift_Mime_HeaderFactory
+     * @var Swift_Mime_SimpleHeaderFactory
      */
     protected $headerFactory;
 
@@ -59,32 +60,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             ->lookup('transport.replacementfactory');
 
         $this->signOptions = PKCS7_DETACHED;
-
-        // Supported since php5.4
-        if (defined('OPENSSL_CIPHER_AES_128_CBC')) {
-            $this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
-        } else {
-            $this->encryptCipher = OPENSSL_CIPHER_RC2_128;
-        }
-    }
-
-    /**
-     * Returns an new Swift_Signers_SMimeSigner instance.
-     *
-     * @param string $certificate
-     * @param string $privateKey
-     *
-     * @return self
-     */
-    public static function newInstance($certificate = null, $privateKey = null)
-    {
-        return new self($certificate, $privateKey);
+        $this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
     }
 
     /**
      * Set the certificate location to use for signing.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
      *
      * @param string       $certificate
      * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
@@ -98,7 +80,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
 
         if (null !== $privateKey) {
-            if (is_array($privateKey)) {
+            if (\is_array($privateKey)) {
                 $this->signPrivateKey = $privateKey;
                 $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
             } else {
@@ -107,9 +89,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         }
 
         $this->signOptions = $signOptions;
-        if (null !== $extraCerts) {
-            $this->extraCerts = str_replace('\\', '/', realpath($extraCerts));
-        }
+        $this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
 
         return $this;
     }
@@ -117,8 +97,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for encryption.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
-     * @see http://nl3.php.net/manual/en/openssl.ciphers.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.ciphers.php
      *
      * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
      * @param int          $cipher
@@ -127,8 +107,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function setEncryptCertificate($recipientCerts, $cipher = null)
     {
-        if (is_array($recipientCerts)) {
-            $this->encryptCert = array();
+        if (\is_array($recipientCerts)) {
+            $this->encryptCert = [];
 
             foreach ($recipientCerts as $cert) {
                 $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
@@ -197,9 +177,27 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     }
 
     /**
-     * Change the Swift_Message to apply the signing.
+     * Specify whether to wrap the entire MIME message in the S/MIME message.
      *
-     * @param Swift_Message $message
+     * According to RFC5751 section 3.1:
+     * In order to protect outer, non-content-related message header fields
+     * (for instance, the "Subject", "To", "From", and "Cc" fields), the
+     * sending client MAY wrap a full MIME message in a message/rfc822
+     * wrapper in order to apply S/MIME security services to these header
+     * fields.  It is up to the receiving client to decide how to present
+     * this "inner" header along with the unprotected "outer" header.
+     *
+     * @param bool $wrap
+     *
+     * @return $this
+     */
+    public function setWrapFullMessage($wrap)
+    {
+        $this->wrapFullMessage = $wrap;
+    }
+
+    /**
+     * Change the Swift_Message to apply the signing.
      *
      * @return $this
      */
@@ -209,17 +207,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             return $this;
         }
 
-        // Store the message using ByteStream to a file{1}
-        // Remove all Children
-        // Sign file{1}, parse the new MIME headers and set them on the primary MimeEntity
-        // Set the singed-body as the new body (without boundary)
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $this->toSMimeByteStream($messageStream, $message);
-        $message->setEncoder(Swift_DependencyContainer::getInstance()->lookup('mime.rawcontentencoder'));
-
-        $message->setChildren(array());
-        $this->streamToMime($messageStream, $message);
+        if ($this->signThenEncrypt) {
+            $this->smimeSignMessage($message);
+            $this->smimeEncryptMessage($message);
+        } else {
+            $this->smimeEncryptMessage($message);
+            $this->smimeSignMessage($message);
+        }
     }
 
     /**
@@ -229,102 +223,303 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function getAlteredHeaders()
     {
-        return array('Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition');
+        return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
     }
 
     /**
-     * @param Swift_InputByteStream $inputStream
-     * @param Swift_Message         $mimeEntity
+     * Sign a Swift message.
      */
-    protected function toSMimeByteStream(Swift_InputByteStream $inputStream, Swift_Message $message)
+    protected function smimeSignMessage(Swift_Message $message)
     {
-        $mimeEntity = $this->createMessage($message);
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        $mimeEntity->toByteStream($messageStream);
-        $messageStream->commit();
-
-        if (null !== $this->signCertificate && null !== $this->encryptCert) {
-            $temporaryStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-            if ($this->signThenEncrypt) {
-                $this->messageStreamToSignedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToEncryptedByteStream($temporaryStream, $inputStream);
-            } else {
-                $this->messageStreamToEncryptedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToSignedByteStream($temporaryStream, $inputStream);
-            }
-        } elseif ($this->signCertificate !== null) {
-            $this->messageStreamToSignedByteStream($messageStream, $inputStream);
-        } else {
-            $this->messageStreamToEncryptedByteStream($messageStream, $inputStream);
+        // If we don't have a certificate we can't sign the message
+        if (null === $this->signCertificate) {
+            return;
         }
-    }
 
-    /**
-     * @param Swift_Message $message
-     *
-     * @return Swift_Message
-     */
-    protected function createMessage(Swift_Message $message)
-    {
-        $mimeEntity = new Swift_Message('', $message->getBody(), $message->getContentType(), $message->getCharset());
-        $mimeEntity->setChildren($message->getChildren());
+        // Work on a clone of the original message
+        $signMessage = clone $message;
+        $signMessage->clearSigners();
 
-        $messageHeaders = $mimeEntity->getHeaders();
-        $messageHeaders->remove('Message-ID');
-        $messageHeaders->remove('Date');
-        $messageHeaders->remove('Subject');
-        $messageHeaders->remove('MIME-Version');
-        $messageHeaders->remove('To');
-        $messageHeaders->remove('From');
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $signMessage = $this->wrapMimeMessage($signMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($signMessage);
+            $this->copyHeaders(
+                $message,
+                $signMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
 
-        return $mimeEntity;
-    }
-
-    /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $inputStream
-     *
-     * @throws Swift_IoException
-     */
-    protected function messageStreamToSignedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $inputStream)
-    {
+        // Copy the cloned message into a temporary file stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $signMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        $args = array($outputStream->getPath(), $signedMessageStream->getPath(), $this->signCertificate, $this->signPrivateKey, array(), $this->signOptions);
-        if (null !== $this->extraCerts) {
-            $args[] = $this->extraCerts;
-        }
-
-        if (!call_user_func_array('openssl_pkcs7_sign', $args)) {
+        // Sign the message using openssl
+        if (!openssl_pkcs7_sign(
+                $messageStream->getPath(),
+                $signedMessageStream->getPath(),
+                $this->signCertificate,
+                $this->signPrivateKey,
+                [],
+                $this->signOptions,
+                $this->extraCerts
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($signedMessageStream, $inputStream);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($signedMessageStream, $message);
     }
 
     /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $is
-     *
-     * @throws Swift_IoException
+     * Encrypt a Swift message.
      */
-    protected function messageStreamToEncryptedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $is)
+    protected function smimeEncryptMessage(Swift_Message $message)
     {
+        // If we don't have a certificate we can't encrypt the message
+        if (null === $this->encryptCert) {
+            return;
+        }
+
+        // Work on a clone of the original message
+        $encryptMessage = clone $message;
+        $encryptMessage->clearSigners();
+
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $encryptMessage = $this->wrapMimeMessage($encryptMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($encryptMessage);
+            $this->copyHeaders(
+                $message,
+                $encryptMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
+
+        // Convert the message content (including headers) to a string
+        // and place it in a temporary file
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $encryptMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_encrypt($outputStream->getPath(), $encryptedMessageStream->getPath(), $this->encryptCert, array(), 0, $this->encryptCipher)) {
+        // Encrypt the message
+        if (!openssl_pkcs7_encrypt(
+                $messageStream->getPath(),
+                $encryptedMessageStream->getPath(),
+                $this->encryptCert,
+                [],
+                0,
+                $this->encryptCipher
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($encryptedMessageStream, $is);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($encryptedMessageStream, $message);
     }
 
     /**
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_InputByteStream  $toStream
+     * Copy named headers from one Swift message to another.
      */
+    protected function copyHeaders(
+        Swift_Message $fromMessage,
+        Swift_Message $toMessage,
+        array $headers = []
+    ) {
+        foreach ($headers as $header) {
+            $this->copyHeader($fromMessage, $toMessage, $header);
+        }
+    }
+
+    /**
+     * Copy a single header from one Swift message to another.
+     *
+     * @param string $headerName
+     */
+    protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
+    {
+        $header = $fromMessage->getHeaders()->get($headerName);
+        if (!$header) {
+            return;
+        }
+        $headers = $toMessage->getHeaders();
+        switch ($header->getFieldType()) {
+            case Swift_Mime_Header::TYPE_TEXT:
+                $headers->addTextHeader($header->getFieldName(), $header->getValue());
+                break;
+            case Swift_Mime_Header::TYPE_PARAMETERIZED:
+                $headers->addParameterizedHeader(
+                    $header->getFieldName(),
+                    $header->getValue(),
+                    $header->getParameters()
+                );
+                break;
+        }
+    }
+
+    /**
+     * Remove all headers from a Swift message.
+     */
+    protected function clearAllHeaders(Swift_Message $message)
+    {
+        $headers = $message->getHeaders();
+        foreach ($headers->listAll() as $header) {
+            $headers->removeAll($header);
+        }
+    }
+
+    /**
+     * Wraps a Swift_Message in a message/rfc822 MIME part.
+     *
+     * @return Swift_MimePart
+     */
+    protected function wrapMimeMessage(Swift_Message $message)
+    {
+        // Start by copying the original message into a message stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        // Create a new MIME part that wraps the original stream
+        $wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
+        $wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
+
+        return $wrappedMessage;
+    }
+
+    protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
+    {
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $this->copyFromOpenSSLOutput($inputStream, $messageStream);
+
+        $this->streamToMime($messageStream, $message);
+    }
+
+    /**
+     * Merges an OutputByteStream from OpenSSL to a Swift_Message.
+     */
+    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+    {
+        // Parse the stream into headers and body
+        list($headers, $messageStream) = $this->parseStream($fromStream);
+
+        // Get the original message headers
+        $messageHeaders = $message->getHeaders();
+
+        // Let the stream determine the headers describing the body content,
+        // since the body of the original message is overwritten by the body
+        // coming from the stream.
+        // These are all content-* headers.
+
+        // Default transfer encoding is 7bit if not set
+        $encoding = '';
+        // Remove all existing transfer encoding headers
+        $messageHeaders->removeAll('Content-Transfer-Encoding');
+        // See whether the stream sets the transfer encoding
+        if (isset($headers['content-transfer-encoding'])) {
+            $encoding = $headers['content-transfer-encoding'];
+        }
+
+        // We use the null content encoder, since the body is already encoded
+        // according to the transfer encoding specified in the stream
+        $message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
+
+        // Set the disposition, if present
+        if (isset($headers['content-disposition'])) {
+            $messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
+        }
+
+        // Copy over the body from the stream using the content type dictated
+        // by the stream content
+        $message->setChildren([]);
+        $message->setBody($messageStream, $headers['content-type']);
+    }
+
+    /**
+     * This message will parse the headers of a MIME email byte stream
+     * and return an array that contains the headers as an associative
+     * array and the email body as a string.
+     *
+     * @return array
+     */
+    protected function parseStream(Swift_OutputByteStream $emailStream)
+    {
+        $bufferLength = 78;
+        $headerData = '';
+        $headerBodySeparator = "\r\n\r\n";
+
+        $emailStream->setReadPointer(0);
+
+        // Read out the headers section from the stream to a string
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $headerData .= $buffer;
+
+            $headersPosEnd = strpos($headerData, $headerBodySeparator);
+
+            // Stop reading if we found the end of the headers
+            if (false !== $headersPosEnd) {
+                break;
+            }
+        }
+
+        // Split the header data into lines
+        $headerData = trim(substr($headerData, 0, $headersPosEnd));
+        $headerLines = explode("\r\n", $headerData);
+        unset($headerData);
+
+        $headers = [];
+        $currentHeaderName = '';
+
+        // Transform header lines into an associative array
+        foreach ($headerLines as $headerLine) {
+            // Handle headers that span multiple lines
+            if (false === strpos($headerLine, ':')) {
+                $headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
+                continue;
+            }
+
+            $header = explode(':', $headerLine, 2);
+            $currentHeaderName = strtolower($header[0] ?? '');
+            $headers[$currentHeaderName] = trim($header[1] ?? '');
+        }
+
+        // Read the entire email body into a byte stream
+        $bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        // Skip the header and separator and point to the body
+        $emailStream->setReadPointer($headersPosEnd + \strlen($headerBodySeparator));
+
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $bodyStream->write($buffer);
+        }
+
+        $bodyStream->commit();
+
+        return [$headers, $bodyStream];
+    }
+
     protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
     {
         $bufferLength = 4096;
@@ -344,93 +539,4 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 
         $toStream->commit();
     }
-
-    /**
-     * Merges an OutputByteStream to Swift_Message.
-     *
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_Message          $message
-     */
-    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
-    {
-        $bufferLength = 78;
-        $headerData = '';
-
-        $fromStream->setReadPointer(0);
-
-        while (($buffer = $fromStream->read($bufferLength)) !== false) {
-            $headerData .= $buffer;
-
-            if (false !== strpos($buffer, "\r\n\r\n")) {
-                break;
-            }
-        }
-
-        $headersPosEnd = strpos($headerData, "\r\n\r\n");
-        $headerData = trim($headerData);
-        $headerData = substr($headerData, 0, $headersPosEnd);
-        $headerLines = explode("\r\n", $headerData);
-        unset($headerData);
-
-        $headers = array();
-        $currentHeaderName = '';
-
-        foreach ($headerLines as $headerLine) {
-            // Line separated
-            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' '.trim($headerLine);
-                continue;
-            }
-
-            $header = explode(':', $headerLine, 2);
-            $currentHeaderName = strtolower($header[0]);
-            $headers[$currentHeaderName] = trim($header[1]);
-        }
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
-
-        $messageHeaders = $message->getHeaders();
-
-        // No need to check for 'application/pkcs7-mime', as this is always base64
-        if ('multipart/signed;' === substr($headers['content-type'], 0, 17)) {
-            if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $headers['content-type'], $contentTypeData)) {
-                throw new Swift_SwiftException('Failed to find Boundary parameter');
-            }
-
-            $boundary = trim($contentTypeData['1'], '"');
-
-            // Skip the header and CRLF CRLF
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-
-            $messageHeaders->remove('Content-Transfer-Encoding');
-            $message->setContentType($headers['content-type']);
-            $message->setBoundary($boundary);
-            $message->setBody($messageStream);
-        } else {
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            if (null === $this->headerFactory) {
-                $this->headerFactory = Swift_DependencyContainer::getInstance()->lookup('mime.headerfactory');
-            }
-
-            $message->setContentType($headers['content-type']);
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Transfer-Encoding', $headers['content-transfer-encoding']));
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Disposition', $headers['content-disposition']));
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-            $message->setBody($messageStream);
-        }
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
index b97f01e7c..56b62323a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -11,7 +11,7 @@
 /**
  * Sends Messages over SMTP with ESMTP support.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  *
  * @method Swift_SmtpTransport setUsername(string $username) Set the username to authenticate with.
  * @method string              getUsername()                 Get the username to authenticate with.
@@ -23,36 +23,23 @@
 class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
 {
     /**
-     * Create a new SmtpTransport, optionally with $host, $port and $security.
-     *
      * @param string $host
      * @param int    $port
-     * @param string $security
+     * @param string|null $encryption SMTP encryption mode:
+     *        - null for plain SMTP (no encryption),
+     *        - 'tls' for SMTP with STARTTLS (best effort encryption),
+     *        - 'ssl' for SMTPS = SMTP over TLS (always encrypted).
      */
-    public function __construct($host = 'localhost', $port = 25, $security = null)
+    public function __construct($host = 'localhost', $port = 25, $encryption = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_EsmtpTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.smtp')
-            );
+        );
 
         $this->setHost($host);
         $this->setPort($port);
-        $this->setEncryption($security);
-    }
-
-    /**
-     * Create a new SmtpTransport instance.
-     *
-     * @param string $host
-     * @param int    $port
-     * @param string $security
-     *
-     * @return self
-     */
-    public static function newInstance($host = 'localhost', $port = 25, $security = null)
-    {
-        return new self($host, $port, $security);
+        $this->setEncryption($encryption);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
index c16ab4b38..9d0e8fee2 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
@@ -35,11 +35,11 @@ interface Swift_Spool
     /**
      * Queues a message.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param Swift_Mime_SimpleMessage $message The message to store
      *
      * @return bool Whether the operation has succeeded
      */
-    public function queueMessage(Swift_Mime_Message $message);
+    public function queueMessage(Swift_Mime_SimpleMessage $message);
 
     /**
      * Sends messages using the given transport instance.
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
index 79c9b1f03..c08e0fb17 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -17,8 +17,6 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 {
     /**
      * Create a new SpoolTransport.
-     *
-     * @param Swift_Spool $spool
      */
     public function __construct(Swift_Spool $spool)
     {
@@ -27,21 +25,9 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 
         $arguments[] = $spool;
 
-        call_user_func_array(
-            array($this, 'Swift_Transport_SpoolTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SpoolTransport::__construct'],
             $arguments
         );
     }
-
-    /**
-     * Create a new SpoolTransport instance.
-     *
-     * @param Swift_Spool $spool
-     *
-     * @return self
-     */
-    public static function newInstance(Swift_Spool $spool)
-    {
-        return new self($spool);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index 9412b1dc7..7e5ddf1b7 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -13,26 +13,23 @@
  *
  * This stream filter deals with Byte arrays rather than simple strings.
  *
- * @author Chris Corbyn
+ * @author  Chris Corbyn
  */
 class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
 {
-    /** The needle(s) to search for */
-    private $_search;
-
     /** The replacement(s) to make */
-    private $_replace;
+    private $replace;
 
     /** The Index for searching */
-    private $_index;
+    private $index;
 
     /** The Search Tree */
-    private $_tree = array();
+    private $tree = [];
 
     /**  Gives the size of the largest search */
-    private $_treeMaxLen = 0;
+    private $treeMaxLen = 0;
 
-    private $_repSize;
+    private $repSize;
 
     /**
      * Create a new ByteArrayReplacementFilter with $search and $replace.
@@ -42,26 +39,25 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function __construct($search, $replace)
     {
-        $this->_search = $search;
-        $this->_index = array();
-        $this->_tree = array();
-        $this->_replace = array();
-        $this->_repSize = array();
+        $this->index = [];
+        $this->tree = [];
+        $this->replace = [];
+        $this->repSize = [];
 
         $tree = null;
         $i = null;
         $last_size = $size = 0;
         foreach ($search as $i => $search_element) {
-            if ($tree !== null) {
-                $tree[-1] = min(count($replace) - 1, $i - 1);
+            if (null !== $tree) {
+                $tree[-1] = min(\count($replace) - 1, $i - 1);
                 $tree[-2] = $last_size;
             }
-            $tree = &$this->_tree;
-            if (is_array($search_element)) {
+            $tree = &$this->tree;
+            if (\is_array($search_element)) {
                 foreach ($search_element as $k => $char) {
-                    $this->_index[$char] = true;
+                    $this->index[$char] = true;
                     if (!isset($tree[$char])) {
-                        $tree[$char] = array();
+                        $tree[$char] = [];
                     }
                     $tree = &$tree[$char];
                 }
@@ -70,27 +66,27 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
             } else {
                 $last_size = 1;
                 if (!isset($tree[$search_element])) {
-                    $tree[$search_element] = array();
+                    $tree[$search_element] = [];
                 }
                 $tree = &$tree[$search_element];
                 $size = max($last_size, $size);
-                $this->_index[$search_element] = true;
+                $this->index[$search_element] = true;
             }
         }
-        if ($i !== null) {
-            $tree[-1] = min(count($replace) - 1, $i);
+        if (null !== $i) {
+            $tree[-1] = min(\count($replace) - 1, $i);
             $tree[-2] = $last_size;
-            $this->_treeMaxLen = $size;
+            $this->treeMaxLen = $size;
         }
         foreach ($replace as $rep) {
-            if (!is_array($rep)) {
-                $rep = array($rep);
+            if (!\is_array($rep)) {
+                $rep = [$rep];
             }
-            $this->_replace[] = $rep;
+            $this->replace[] = $rep;
         }
-        for ($i = count($this->_replace) - 1; $i >= 0; --$i) {
-            $this->_replace[$i] = $rep = $this->filter($this->_replace[$i], $i);
-            $this->_repSize[$i] = count($rep);
+        for ($i = \count($this->replace) - 1; $i >= 0; --$i) {
+            $this->replace[$i] = $rep = $this->filter($this->replace[$i], $i);
+            $this->repSize[$i] = \count($rep);
         }
     }
 
@@ -105,47 +101,47 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
     {
         $endOfBuffer = end($buffer);
 
-        return isset($this->_index[$endOfBuffer]);
+        return isset($this->index[$endOfBuffer]);
     }
 
     /**
      * Perform the actual replacements on $buffer and return the result.
      *
      * @param array $buffer
-     * @param int   $_minReplaces
+     * @param int   $minReplaces
      *
      * @return array
      */
-    public function filter($buffer, $_minReplaces = -1)
+    public function filter($buffer, $minReplaces = -1)
     {
-        if ($this->_treeMaxLen == 0) {
+        if (0 == $this->treeMaxLen) {
             return $buffer;
         }
 
-        $newBuffer = array();
-        $buf_size = count($buffer);
+        $newBuffer = [];
+        $buf_size = \count($buffer);
         $last_size = 0;
         for ($i = 0; $i < $buf_size; ++$i) {
-            $search_pos = $this->_tree;
+            $search_pos = $this->tree;
             $last_found = PHP_INT_MAX;
             // We try to find if the next byte is part of a search pattern
-            for ($j = 0; $j <= $this->_treeMaxLen; ++$j) {
+            for ($j = 0; $j <= $this->treeMaxLen; ++$j) {
                 // We have a new byte for a search pattern
                 if (isset($buffer[$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
                     $search_pos = $search_pos[$buffer[$p]];
                     // We have a complete pattern, save, in case we don't find a better match later
                     if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
-                        && $search_pos[-1] > $_minReplaces) {
+                        && $search_pos[-1] > $minReplaces) {
                         $last_found = $search_pos[-1];
                         $last_size = $search_pos[-2];
                     }
                 }
                 // We got a complete pattern
-                elseif ($last_found !== PHP_INT_MAX) {
+                elseif (PHP_INT_MAX !== $last_found) {
                     // Adding replacement datas to output buffer
-                    $rep_size = $this->_repSize[$last_found];
+                    $rep_size = $this->repSize[$last_found];
                     for ($j = 0; $j < $rep_size; ++$j) {
-                        $newBuffer[] = $this->_replace[$last_found][$j];
+                        $newBuffer[] = $this->replace[$last_found][$j];
                     }
                     // We Move cursor forward
                     $i += $last_size - 1;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
index f64144af2..50a63f1aa 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -16,10 +16,10 @@
 class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
 {
     /** The needle(s) to search for */
-    private $_search;
+    private $search;
 
     /** The replacement(s) to make */
-    private $_replace;
+    private $replace;
 
     /**
      * Create a new StringReplacementFilter with $search and $replace.
@@ -29,8 +29,8 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
      */
     public function __construct($search, $replace)
     {
-        $this->_search = $search;
-        $this->_replace = $replace;
+        $this->search = $search;
+        $this->replace = $replace;
     }
 
     /**
@@ -47,7 +47,7 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
         }
 
         $endOfBuffer = substr($buffer, -1);
-        foreach ((array) $this->_search as $needle) {
+        foreach ((array) $this->search as $needle) {
             if (false !== strpos($needle, $endOfBuffer)) {
                 return true;
             }
@@ -65,6 +65,6 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
      */
     public function filter($buffer)
     {
-        return str_replace($this->_search, $this->_replace, $buffer);
+        return str_replace($this->search, $this->replace, $buffer);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
index e98240b5b..783b8896d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -16,7 +16,7 @@
 class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
 {
     /** Lazy-loaded filters */
-    private $_filters = array();
+    private $filters = [];
 
     /**
      * Create a new StreamFilter to replace $search with $replace in a string.
@@ -28,18 +28,18 @@ class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_Replac
      */
     public function createFilter($search, $replace)
     {
-        if (!isset($this->_filters[$search][$replace])) {
-            if (!isset($this->_filters[$search])) {
-                $this->_filters[$search] = array();
+        if (!isset($this->filters[$search][$replace])) {
+            if (!isset($this->filters[$search])) {
+                $this->filters[$search] = [];
             }
 
-            if (!isset($this->_filters[$search][$replace])) {
-                $this->_filters[$search][$replace] = array();
+            if (!isset($this->filters[$search][$replace])) {
+                $this->filters[$search][$replace] = [];
             }
 
-            $this->_filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+            $this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
         }
 
-        return $this->_filters[$search][$replace];
+        return $this->filters[$search][$replace];
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
index db3d31093..15e68b18e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
@@ -18,9 +18,8 @@ class Swift_SwiftException extends Exception
     /**
      * Create a new SwiftException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
index 6535eadf2..bc324e868 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
@@ -32,23 +32,45 @@ interface Swift_Transport
      */
     public function stop();
 
+    /**
+     * Check if this Transport mechanism is alive.
+     *
+     * If a Transport mechanism session is no longer functional, the method
+     * returns FALSE. It is the responsibility of the developer to handle this
+     * case and restart the Transport mechanism manually.
+     *
+     * @example
+     *
+     *   if (!$transport->ping()) {
+     *      $transport->stop();
+     *      $transport->start();
+     *   }
+     *
+     * The Transport mechanism will be started, if it is not already.
+     *
+     * It is undefined if the Transport mechanism attempts to restart as long as
+     * the return value reflects whether the mechanism is now functional.
+     *
+     * @return bool TRUE if the transport is alive
+     */
+    public function ping();
+
     /**
      * Send the given Message.
      *
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * This is the responsibility of the send method to start the transport if needed.
+     *
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null);
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null);
 
     /**
      * Register a plugin in the Transport.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index 60233f968..d2dbd7a66 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -16,34 +16,42 @@
 abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
 {
     /** Input-Output buffer for sending/receiving SMTP commands and responses */
-    protected $_buffer;
+    protected $buffer;
 
     /** Connection status */
-    protected $_started = false;
+    protected $started = false;
 
     /** The domain name to use in HELO command */
-    protected $_domain = '[127.0.0.1]';
+    protected $domain = '[127.0.0.1]';
 
     /** The event dispatching layer */
-    protected $_eventDispatcher;
+    protected $eventDispatcher;
+
+    protected $addressEncoder;
+
+    /** Whether the PIPELINING SMTP extension is enabled (RFC 2920) */
+    protected $pipelining = null;
+
+    /** The pipelined commands waiting for response */
+    protected $pipeline = [];
 
     /** Source Ip */
-    protected $_sourceIp;
+    protected $sourceIp;
 
     /** Return an array of params for the Buffer */
-    abstract protected function _getBufferParams();
+    abstract protected function getBufferParams();
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher)
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->_eventDispatcher = $dispatcher;
-        $this->_buffer = $buf;
-        $this->_lookupHostname();
+        $this->buffer = $buf;
+        $this->eventDispatcher = $dispatcher;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
+        $this->setLocalDomain($localDomain);
     }
 
     /**
@@ -52,8 +60,9 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * This should be a fully-qualified domain name and should be truly the domain
      * you're using.
      *
-     * If your server doesn't have a domain name, use the IP in square
-     * brackets (i.e. [127.0.0.1]).
+     * If your server does not have a domain name, use the IP address. This will
+     * automatically be wrapped in square brackets as described in RFC 5321,
+     * section 4.1.3.
      *
      * @param string $domain
      *
@@ -61,7 +70,15 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setLocalDomain($domain)
     {
-        $this->_domain = $domain;
+        if ('[' !== substr($domain, 0, 1)) {
+            if (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                $domain = '['.$domain.']';
+            } elseif (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                $domain = '[IPv6:'.$domain.']';
+            }
+        }
+
+        $this->domain = $domain;
 
         return $this;
     }
@@ -69,11 +86,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /**
      * Get the name of the domain Swift will identify as.
      *
+     * If an IP address was specified, this will be returned wrapped in square
+     * brackets as described in RFC 5321, section 4.1.3.
+     *
      * @return string
      */
     public function getLocalDomain()
     {
-        return $this->_domain;
+        return $this->domain;
     }
 
     /**
@@ -83,7 +103,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setSourceIp($source)
     {
-        $this->_sourceIp = $source;
+        $this->sourceIp = $source;
     }
 
     /**
@@ -93,7 +113,17 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function getSourceIp()
     {
-        return $this->_sourceIp;
+        return $this->sourceIp;
+    }
+
+    public function setAddressEncoder(Swift_AddressEncoder $addressEncoder)
+    {
+        $this->addressEncoder = $addressEncoder;
+    }
+
+    public function getAddressEncoder()
+    {
+        return $this->addressEncoder;
     }
 
     /**
@@ -101,27 +131,27 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function start()
     {
-        if (!$this->_started) {
-            if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this)) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
+        if (!$this->started) {
+            if ($evt = $this->eventDispatcher->createTransportChangeEvent($this)) {
+                $this->eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
                 if ($evt->bubbleCancelled()) {
                     return;
                 }
             }
 
             try {
-                $this->_buffer->initialize($this->_getBufferParams());
+                $this->buffer->initialize($this->getBufferParams());
             } catch (Swift_TransportException $e) {
-                $this->_throwException($e);
+                $this->throwException($e);
             }
-            $this->_readGreeting();
-            $this->_doHeloCommand();
+            $this->readGreeting();
+            $this->doHeloCommand();
 
             if ($evt) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'transportStarted');
+                $this->eventDispatcher->dispatchEvent($evt, 'transportStarted');
             }
 
-            $this->_started = true;
+            $this->started = true;
         }
     }
 
@@ -132,7 +162,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function isStarted()
     {
-        return $this->_started;
+        return $this->started;
     }
 
     /**
@@ -141,49 +171,45 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
+        if (!$this->isStarted()) {
+            $this->start();
+        }
+
         $sent = 0;
         $failedRecipients = (array) $failedRecipients;
 
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
             if ($evt->bubbleCancelled()) {
                 return 0;
             }
         }
 
-        if (!$reversePath = $this->_getReversePath($message)) {
-            $this->_throwException(new Swift_TransportException(
-                'Cannot send message without a sender address'
-                )
-            );
+        if (!$reversePath = $this->getReversePath($message)) {
+            $this->throwException(new Swift_TransportException('Cannot send message without a sender address'));
         }
 
         $to = (array) $message->getTo();
         $cc = (array) $message->getCc();
-        $tos = array_merge($to, $cc);
         $bcc = (array) $message->getBcc();
+        $tos = array_merge($to, $cc, $bcc);
 
-        $message->setBcc(array());
+        $message->setBcc([]);
 
         try {
-            $sent += $this->_sendTo($message, $reversePath, $tos, $failedRecipients);
-            $sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
-        } catch (Exception $e) {
+            $sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
+        } finally {
             $message->setBcc($bcc);
-            throw $e;
         }
 
-        $message->setBcc($bcc);
-
         if ($evt) {
-            if ($sent == count($to) + count($cc) + count($bcc)) {
+            if ($sent == \count($to) + \count($cc) + \count($bcc)) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
             } elseif ($sent > 0) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
@@ -191,7 +217,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
             }
             $evt->setFailedRecipients($failedRecipients);
-            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
         $message->generateId(); //Make sure a new Message ID is used
@@ -204,40 +230,61 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function stop()
     {
-        if ($this->_started) {
-            if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this)) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
+        if ($this->started) {
+            if ($evt = $this->eventDispatcher->createTransportChangeEvent($this)) {
+                $this->eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
                 if ($evt->bubbleCancelled()) {
                     return;
                 }
             }
 
             try {
-                $this->executeCommand("QUIT\r\n", array(221));
+                $this->executeCommand("QUIT\r\n", [221]);
             } catch (Swift_TransportException $e) {
             }
 
             try {
-                $this->_buffer->terminate();
+                $this->buffer->terminate();
 
                 if ($evt) {
-                    $this->_eventDispatcher->dispatchEvent($evt, 'transportStopped');
+                    $this->eventDispatcher->dispatchEvent($evt, 'transportStopped');
                 }
             } catch (Swift_TransportException $e) {
-                $this->_throwException($e);
+                $this->throwException($e);
             }
         }
-        $this->_started = false;
+        $this->started = false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        try {
+            if (!$this->isStarted()) {
+                $this->start();
+            }
+
+            $this->executeCommand("NOOP\r\n", [250]);
+        } catch (Swift_TransportException $e) {
+            try {
+                $this->stop();
+            } catch (Swift_TransportException $e) {
+            }
+
+            return false;
+        }
+
+        return true;
     }
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_eventDispatcher->bindEventListener($plugin);
+        $this->eventDispatcher->bindEventListener($plugin);
     }
 
     /**
@@ -245,7 +292,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function reset()
     {
-        $this->executeCommand("RSET\r\n", array(250));
+        $this->executeCommand("RSET\r\n", [250], $failures, true);
     }
 
     /**
@@ -255,7 +302,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function getBuffer()
     {
-        return $this->_buffer;
+        return $this->buffer;
     }
 
     /**
@@ -263,78 +310,104 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      *
      * If no response codes are given, the response will not be validated.
      * If codes are given, an exception will be thrown on an invalid response.
+     * If the command is RCPT TO, and the pipeline is non-empty, no exception
+     * will be thrown; instead the failing address is added to $failures.
      *
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
-        $seq = $this->_buffer->write($command);
-        $response = $this->_getFullResponse($seq);
-        if ($evt = $this->_eventDispatcher->createCommandEvent($this, $command, $codes)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'commandSent');
+        $seq = $this->buffer->write($command);
+        if ($evt = $this->eventDispatcher->createCommandEvent($this, $command, $codes)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'commandSent');
+        }
+
+        $this->pipeline[] = [$command, $seq, $codes, $address];
+
+        if ($pipeline && $this->pipelining) {
+            return null;
+        }
+
+        $response = null;
+
+        while ($this->pipeline) {
+            list($command, $seq, $codes, $address) = array_shift($this->pipeline);
+            $response = $this->getFullResponse($seq);
+            try {
+                $this->assertResponseCode($response, $codes);
+            } catch (Swift_TransportException $e) {
+                if ($this->pipeline && $address) {
+                    $failures[] = $address;
+                } else {
+                    $this->throwException($e);
+                }
+            }
         }
-        $this->_assertResponseCode($response, $codes);
 
         return $response;
     }
 
     /** Read the opening SMTP greeting */
-    protected function _readGreeting()
+    protected function readGreeting()
     {
-        $this->_assertResponseCode($this->_getFullResponse(0), array(220));
+        $this->assertResponseCode($this->getFullResponse(0), [220]);
     }
 
     /** Send the HELO welcome */
-    protected function _doHeloCommand()
+    protected function doHeloCommand()
     {
         $this->executeCommand(
-            sprintf("HELO %s\r\n", $this->_domain), array(250)
+            sprintf("HELO %s\r\n", $this->domain), [250]
             );
     }
 
     /** Send the MAIL FROM command */
-    protected function _doMailFromCommand($address)
+    protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>\r\n", $address), array(250)
+            sprintf("MAIL FROM:<%s>\r\n", $address), [250], $failures, true
             );
     }
 
     /** Send the RCPT TO command */
-    protected function _doRcptToCommand($address)
+    protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>\r\n", $address), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Send the DATA command */
-    protected function _doDataCommand()
+    protected function doDataCommand(&$failedRecipients)
     {
-        $this->executeCommand("DATA\r\n", array(354));
+        $this->executeCommand("DATA\r\n", [354], $failedRecipients);
     }
 
     /** Stream the contents of the message over the buffer */
-    protected function _streamMessage(Swift_Mime_Message $message)
+    protected function streamMessage(Swift_Mime_SimpleMessage $message)
     {
-        $this->_buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+        $this->buffer->setWriteTranslations(["\r\n." => "\r\n.."]);
         try {
-            $message->toByteStream($this->_buffer);
-            $this->_buffer->flushBuffers();
+            $message->toByteStream($this->buffer);
+            $this->buffer->flushBuffers();
         } catch (Swift_TransportException $e) {
-            $this->_throwException($e);
+            $this->throwException($e);
         }
-        $this->_buffer->setWriteTranslations(array());
-        $this->executeCommand("\r\n.\r\n", array(250));
+        $this->buffer->setWriteTranslations([]);
+        $this->executeCommand("\r\n.\r\n", [250]);
     }
 
     /** Determine the best-use reverse path for this message */
-    protected function _getReversePath(Swift_Mime_Message $message)
+    protected function getReversePath(Swift_Mime_SimpleMessage $message)
     {
         $return = $message->getReturnPath();
         $sender = $message->getSender();
@@ -355,10 +428,10 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     }
 
     /** Throw a TransportException, first sending it to any listeners */
-    protected function _throwException(Swift_TransportException $e)
+    protected function throwException(Swift_TransportException $e)
     {
-        if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
+        if ($evt = $this->eventDispatcher->createTransportExceptionEvent($this, $e)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
             if (!$evt->bubbleCancelled()) {
                 throw $e;
             }
@@ -368,64 +441,65 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     }
 
     /** Throws an Exception if a response code is incorrect */
-    protected function _assertResponseCode($response, $wanted)
+    protected function assertResponseCode($response, $wanted)
     {
-        list($code) = sscanf($response, '%3d');
-        $valid = (empty($wanted) || in_array($code, $wanted));
+        if (!$response) {
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got an empty response'));
+        }
 
-        if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,
+        list($code) = sscanf($response, '%3d');
+        $valid = (empty($wanted) || \in_array($code, $wanted));
+
+        if ($evt = $this->eventDispatcher->createResponseEvent($this, $response,
             $valid)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'responseReceived');
+            $this->eventDispatcher->dispatchEvent($evt, 'responseReceived');
         }
 
         if (!$valid) {
-            $this->_throwException(
-                new Swift_TransportException(
-                    'Expected response code '.implode('/', $wanted).' but got code '.
-                    '"'.$code.'", with message "'.$response.'"',
-                    $code)
-                );
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got code "'.$code.'", with message "'.$response.'"', $code));
         }
     }
 
     /** Get an entire multi-line response using its sequence number */
-    protected function _getFullResponse($seq)
+    protected function getFullResponse($seq)
     {
         $response = '';
         try {
             do {
-                $line = $this->_buffer->readLine($seq);
+                $line = $this->buffer->readLine($seq);
                 $response .= $line;
             } while (null !== $line && false !== $line && ' ' != $line[3]);
         } catch (Swift_TransportException $e) {
-            $this->_throwException($e);
+            $this->throwException($e);
         } catch (Swift_IoException $e) {
-            $this->_throwException(
-                new Swift_TransportException(
-                    $e->getMessage())
-                );
+            $this->throwException(new Swift_TransportException($e->getMessage(), 0, $e));
         }
 
         return $response;
     }
 
     /** Send an email to the given recipients from the given reverse path */
-    private function _doMailTransaction($message, $reversePath, array $recipients, array &$failedRecipients)
+    private function doMailTransaction($message, $reversePath, array $recipients, array &$failedRecipients)
     {
         $sent = 0;
-        $this->_doMailFromCommand($reversePath);
+        $this->doMailFromCommand($reversePath);
         foreach ($recipients as $forwardPath) {
             try {
-                $this->_doRcptToCommand($forwardPath);
+                $this->doRcptToCommand($forwardPath);
                 ++$sent;
             } catch (Swift_TransportException $e) {
                 $failedRecipients[] = $forwardPath;
+            } catch (Swift_AddressEncoderException $e) {
+                $failedRecipients[] = $forwardPath;
             }
         }
 
-        if ($sent != 0) {
-            $this->_doDataCommand();
-            $this->_streamMessage($message);
+        if (0 != $sent) {
+            $sent += \count($failedRecipients);
+            $this->doDataCommand($failedRecipients);
+            $sent -= \count($failedRecipients);
+
+            $this->streamMessage($message);
         } else {
             $this->reset();
         }
@@ -434,58 +508,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     }
 
     /** Send a message to the given To: recipients */
-    private function _sendTo(Swift_Mime_Message $message, $reversePath, array $to, array &$failedRecipients)
+    private function sendTo(Swift_Mime_SimpleMessage $message, $reversePath, array $to, array &$failedRecipients)
     {
         if (empty($to)) {
             return 0;
         }
 
-        return $this->_doMailTransaction($message, $reversePath, array_keys($to),
+        return $this->doMailTransaction($message, $reversePath, array_keys($to),
             $failedRecipients);
     }
 
-    /** Send a message to all Bcc: recipients */
-    private function _sendBcc(Swift_Mime_Message $message, $reversePath, array $bcc, array &$failedRecipients)
-    {
-        $sent = 0;
-        foreach ($bcc as $forwardPath => $name) {
-            $message->setBcc(array($forwardPath => $name));
-            $sent += $this->_doMailTransaction(
-                $message, $reversePath, array($forwardPath), $failedRecipients
-                );
-        }
-
-        return $sent;
-    }
-
-    /** Try to determine the hostname of the server this is run on */
-    private function _lookupHostname()
-    {
-        if (!empty($_SERVER['SERVER_NAME']) && $this->_isFqdn($_SERVER['SERVER_NAME'])) {
-            $this->_domain = $_SERVER['SERVER_NAME'];
-        } elseif (!empty($_SERVER['SERVER_ADDR'])) {
-            // Set the address literal tag (See RFC 5321, section: 4.1.3)
-            if (false === strpos($_SERVER['SERVER_ADDR'], ':')) {
-                $prefix = ''; // IPv4 addresses are not tagged.
-            } else {
-                $prefix = 'IPv6:'; // Adding prefix in case of IPv6.
-            }
-
-            $this->_domain = sprintf('[%s%s]', $prefix, $_SERVER['SERVER_ADDR']);
-        }
-    }
-
-    /** Determine is the $hostname is a fully-qualified name */
-    private function _isFqdn($hostname)
-    {
-        // We could do a really thorough check, but there's really no point
-        if (false !== $dotPos = strpos($hostname, '.')) {
-            return ($dotPos > 0) && ($dotPos != strlen($hostname) - 1);
-        }
-
-        return false;
-    }
-
     /**
      * Destructor.
      */
@@ -496,4 +528,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Exception $e) {
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index 53f721d03..bb3a16150 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -26,29 +26,23 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", [334]);
             $challenge = base64_decode(substr($challenge, 4));
             $message = base64_encode(
-                $username.' '.$this->_getResponse($password, $challenge)
-                );
-            $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+                $username.' '.$this->getResponse($password, $challenge)
+            );
+            $agent->executeCommand(sprintf("%s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
@@ -60,18 +54,18 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
      *
      * @return string
      */
-    private function _getResponse($secret, $challenge)
+    private function getResponse($secret, $challenge)
     {
-        if (strlen($secret) > 64) {
+        if (\strlen($secret) > 64) {
             $secret = pack('H32', md5($secret));
         }
 
-        if (strlen($secret) < 64) {
-            $secret = str_pad($secret, 64, chr(0));
+        if (\strlen($secret) < 64) {
+            $secret = str_pad($secret, 64, \chr(0));
         }
 
-        $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
+        $k_ipad = substr($secret, 0, 64) ^ str_repeat(\chr(0x36), 64);
+        $k_opad = substr($secret, 0, 64) ^ str_repeat(\chr(0x5C), 64);
 
         $inner = pack('H32', md5($k_ipad.$challenge));
         $digest = md5($k_opad.$inner);
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index 6ab6e3337..0b9d81b8a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -26,26 +26,20 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $agent->executeCommand("AUTH LOGIN\r\n", array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+            $agent->executeCommand("AUTH LOGIN\r\n", [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username ?? '')), [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password ?? '')), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index 839265857..41931fdd2 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -13,7 +13,7 @@
 /**
  * Handles NTLM authentication.
  *
- * @author Ward Peeters <ward@coding-tech.com>
+ * @author     Ward Peeters <ward@coding-tech.com>
  */
 class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Esmtp_Authenticator
 {
@@ -31,61 +31,57 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
+     * {@inheritdoc}
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * @throws \LogicException
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
-        if (!function_exists('openssl_random_pseudo_bytes') || !function_exists('openssl_encrypt')) {
+        if (!\function_exists('openssl_encrypt')) {
             throw new LogicException('The OpenSSL extension must be enabled to use the NTLM authenticator.');
         }
 
-        if (!function_exists('bcmul')) {
+        if (!\function_exists('bcmul')) {
             throw new LogicException('The BCMath functions must be enabled to use the NTLM authenticator.');
         }
 
         try {
             // execute AUTH command and filter out the code at the beginning
             // AUTH NTLM xxxx
-            $response = base64_decode(substr(trim($this->sendMessage1($agent)), 4));
+            $response = base64_decode(substr(trim($this->sendMessage1($agent) ?? ''), 4));
 
             // extra parameters for our unit cases
-            $timestamp = func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
-            $client = func_num_args() > 4 ? func_get_arg(4) : $this->getRandomBytes(8);
+            $timestamp = \func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
+            $client = \func_num_args() > 4 ? func_get_arg(4) : random_bytes(8);
 
             // Message 3 response
             $this->sendMessage3($response, $username, $password, $timestamp, $client, $agent);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
     protected function si2bin($si, $bits = 32)
     {
         $bin = null;
-        if ($si >= -pow(2, $bits - 1) && ($si <= pow(2, $bits - 1))) {
+        if ($si >= -2 ** ($bits - 1) && ($si <= 2 ** ($bits - 1))) {
             // positive or zero
             if ($si >= 0) {
                 $bin = base_convert($si, 10, 2);
                 // pad to $bits bit
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length < $bits) {
                     $bin = str_repeat('0', $bits - $bin_length).$bin;
                 }
             } else {
                 // negative
-                $si = -$si - pow(2, $bits);
+                $si = -$si - 2 ** $bits;
                 $bin = base_convert($si, 10, 2);
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length > $bits) {
                     $bin = str_repeat('1', $bits - $bin_length).$bin;
                 }
@@ -98,15 +94,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our auth message and returns the response.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return string SMTP Response
      */
     protected function sendMessage1(Swift_Transport_SmtpAgent $agent)
     {
         $message = $this->createMessage1();
 
-        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), array(334));
+        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), [334]);
     }
 
     /**
@@ -121,15 +115,15 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $responseHex = bin2hex($response);
         $length = floor(hexdec(substr($responseHex, 28, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($responseHex, 32, 4)) / 256) * 2;
-        $challenge = $this->hex2bin(substr($responseHex, 48, 16));
-        $context = $this->hex2bin(substr($responseHex, 64, 16));
-        $targetInfoH = $this->hex2bin(substr($responseHex, 80, 16));
-        $targetName = $this->hex2bin(substr($responseHex, $offset, $length));
+        $challenge = hex2bin(substr($responseHex, 48, 16));
+        $context = hex2bin(substr($responseHex, 64, 16));
+        $targetInfoH = hex2bin(substr($responseHex, 80, 16));
+        $targetName = hex2bin(substr($responseHex, $offset, $length));
         $offset = floor(hexdec(substr($responseHex, 88, 4)) / 256) * 2;
         $targetInfoBlock = substr($responseHex, $offset);
         list($domainName, $serverName, $DNSDomainName, $DNSServerName, $terminatorByte) = $this->readSubBlock($targetInfoBlock);
 
-        return array(
+        return [
             $challenge,
             $context,
             $targetInfoH,
@@ -138,16 +132,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $serverName,
             $DNSDomainName,
             $DNSServerName,
-            $this->hex2bin($targetInfoBlock),
+            hex2bin($targetInfoBlock),
             $terminatorByte,
-        );
+        ];
     }
 
     /**
      * Read the blob information in from message2.
      *
-     * @param $block
-     *
      * @return array
      */
     protected function readSubBlock($block)
@@ -155,17 +147,17 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         // remove terminatorByte cause it's always the same
         $block = substr($block, 0, -8);
 
-        $length = strlen($block);
+        $length = \strlen($block);
         $offset = 0;
-        $data = array();
+        $data = [];
         while ($offset < $length) {
             $blockLength = hexdec(substr(substr($block, $offset, 8), -4)) / 256;
             $offset += 8;
-            $data[] = $this->hex2bin(substr($block, $offset, $blockLength * 2));
+            $data[] = hex2bin(substr($block, $offset, $blockLength * 2));
             $offset += $blockLength * 2;
         }
 
-        if (count($data) == 3) {
+        if (3 == \count($data)) {
             $data[] = $data[2];
             $data[2] = '';
         }
@@ -178,13 +170,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our final message with all our data.
      *
-     * @param string                    $response  Message 1 response (message 2)
-     * @param string                    $username
-     * @param string                    $password
-     * @param string                    $timestamp
-     * @param string                    $client
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param bool                      $v2        Use version2 of the protocol
+     * @param string $response  Message 1 response (message 2)
+     * @param string $username
+     * @param string $password
+     * @param string $timestamp
+     * @param string $client
+     * @param bool   $v2        Use version2 of the protocol
      *
      * @return string
      */
@@ -208,7 +199,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
         $message = $this->createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse);
 
-        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), array(235));
+        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), [235]);
     }
 
     /**
@@ -292,18 +283,18 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function getDomainAndUsername($name)
     {
-        if (strpos($name, '\\') !== false) {
+        if (false !== strpos($name, '\\')) {
             return explode('\\', $name);
         }
 
         if (false !== strpos($name, '@')) {
             list($user, $domain) = explode('@', $name);
 
-            return array($domain, $user);
+            return [$domain, $user];
         }
 
         // no domain passed
-        return array('', $name);
+        return ['', $name];
     }
 
     /**
@@ -373,7 +364,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $binary = $this->si2bin($time, 64); // create 64 bit binary string
         $timestamp = '';
         for ($i = 0; $i < 8; ++$i) {
-            $timestamp .= chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
+            $timestamp .= \chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
         }
 
         return $timestamp;
@@ -394,7 +385,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     {
         $lmPass = '00'; // by default 00
         // if $password > 15 than we can't use this method
-        if (strlen($password) <= 15) {
+        if (\strlen($password) <= 15) {
             $ntlmHash = $this->md4Encrypt($password);
             $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
 
@@ -434,21 +425,21 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
     protected function createDesKey($key)
     {
-        $material = array(bin2hex($key[0]));
-        $len = strlen($key);
+        $material = [bin2hex($key[0])];
+        $len = \strlen($key);
         for ($i = 1; $i < $len; ++$i) {
             list($high, $low) = str_split(bin2hex($key[$i]));
-            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
+            $v = $this->castToByte(\ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
             $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
         }
-        $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
+        $material[] = str_pad(substr(dechex($this->castToByte(\ord($key[6]) << 1)), -2), 2, '0');
 
         // odd parity
         foreach ($material as $k => $v) {
             $b = $this->castToByte(hexdec($v));
-            $needsParity = (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
+            $needsParity = 0 == (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
                         ^ $this->uRShift($b, 4) ^ $this->uRShift($b, 3) ^ $this->uRShift($b, 2)
-                        ^ $this->uRShift($b, 1)) & 0x01) == 0;
+                        ^ $this->uRShift($b, 1)) & 0x01);
 
             list($high, $low) = str_split($v);
             if ($needsParity) {
@@ -458,7 +449,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             }
         }
 
-        return $this->hex2bin(implode('', $material));
+        return hex2bin(implode('', $material));
     }
 
     /** HELPER FUNCTIONS */
@@ -474,7 +465,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function createSecurityBuffer($value, $offset, $is16 = false)
     {
-        $length = strlen(bin2hex($value));
+        $length = \strlen(bin2hex($value));
         $length = $is16 ? $length / 2 : $length;
         $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
 
@@ -493,7 +484,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $length = floor(hexdec(substr($value, 0, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($value, 8, 4)) / 256) * 2;
 
-        return array($length, $offset);
+        return [$length, $offset];
     }
 
     /**
@@ -519,7 +510,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function uRShift($a, $b)
     {
-        if ($b == 0) {
+        if (0 == $b) {
             return $a;
         }
 
@@ -538,7 +529,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     protected function createByte($input, $bytes = 4, $isHex = true)
     {
         if ($isHex) {
-            $byte = $this->hex2bin(str_pad($input, $bytes * 2, '00'));
+            $byte = hex2bin(str_pad($input, $bytes * 2, '00'));
         } else {
             $byte = str_pad($input, $bytes, "\x00");
         }
@@ -546,24 +537,6 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         return $byte;
     }
 
-    /**
-     * Create random bytes.
-     *
-     * @param $length
-     *
-     * @return string
-     */
-    protected function getRandomBytes($length)
-    {
-        $bytes = openssl_random_pseudo_bytes($length, $strong);
-
-        if (false !== $bytes && true === $strong) {
-            return $bytes;
-        }
-
-        throw new RuntimeException('OpenSSL did not produce a secure random number.');
-    }
-
     /** ENCRYPTION ALGORITHMS */
 
     /**
@@ -576,8 +549,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function desEncrypt($value, $key)
     {
-        // 1 == OPENSSL_RAW_DATA - but constant is only available as of PHP 5.4.
-        return substr(openssl_encrypt($value, 'DES-ECB', $key, 1), 0, 8);
+        return substr(openssl_encrypt($value, 'DES-ECB', $key, \OPENSSL_RAW_DATA), 0, 8);
     }
 
     /**
@@ -591,7 +563,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     protected function md5Encrypt($key, $msg)
     {
         $blocksize = 64;
-        if (strlen($key) > $blocksize) {
+        if (\strlen($key) > $blocksize) {
             $key = pack('H*', md5($key));
         }
 
@@ -609,13 +581,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      *
      * @return string
      *
-     * @see http://php.net/manual/en/ref.hash.php
+     * @see https://secure.php.net/manual/en/ref.hash.php
      */
     protected function md4Encrypt($input)
     {
         $input = $this->convertTo16bit($input);
 
-        return function_exists('hash') ? $this->hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
+        return \function_exists('hash') ? hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
     }
 
     /**
@@ -630,22 +602,6 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         return iconv('UTF-8', 'UTF-16LE', $input);
     }
 
-    /**
-     * Hex2bin replacement for < PHP 5.4.
-     *
-     * @param string $hex
-     *
-     * @return string Binary
-     */
-    protected function hex2bin($hex)
-    {
-        if (function_exists('hex2bin')) {
-            return hex2bin($hex);
-        } else {
-            return pack('H*', $hex);
-        }
-    }
-
     /**
      * @param string $message
      */
@@ -656,8 +612,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
         echo $messageId." Type Indicator<br />\n";
 
-        if ($messageId == '02000000') {
-            $map = array(
+        if ('02000000' == $messageId) {
+            $map = [
                 'Challenge',
                 'Context',
                 'Target Information Security Buffer',
@@ -668,14 +624,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'DNS Server Name',
                 'BLOB',
                 'Target Information Terminator',
-            );
+            ];
 
-            $data = $this->parseMessage2($this->hex2bin($message));
+            $data = $this->parseMessage2(hex2bin($message));
 
             foreach ($map as $key => $value) {
                 echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
             }
-        } elseif ($messageId == '03000000') {
+        } elseif ('03000000' == $messageId) {
             $i = 0;
             $data[$i++] = substr($message, 24, 16);
             list($lmLength, $lmOffset) = $this->readSecurityBuffer($data[$i - 1]);
@@ -700,7 +656,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $data[$i++] = substr($message, $lmOffset, $lmLength);
             $data[$i] = substr($message, $ntmlOffset, $ntmlLength);
 
-            $map = array(
+            $map = [
                 'LM Response Security Buffer',
                 'NTLM Response Security Buffer',
                 'Target Name Security Buffer',
@@ -713,10 +669,10 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'Workstation Name Data',
                 'LM Response Data',
                 'NTLM Response Data',
-            );
+            ];
 
             foreach ($map as $key => $value) {
-                echo $data[$key].' - '.$this->hex2bin($data[$key]).' ||| '.$value."<br />\n";
+                echo $data[$key].' - '.hex2bin($data[$key]).' ||| '.$value."<br />\n";
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
index 43219f934..41d0a50a8 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -26,25 +26,19 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $message = base64_encode($username.chr(0).$username.chr(0).$password);
-            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+            $message = base64_encode($username.\chr(0).$username.\chr(0).$password);
+            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
index ca35e7b83..859f22f3d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -13,7 +13,7 @@
  *
  * Example:
  * <code>
- * $transport = Swift_SmtpTransport::newInstance('smtp.gmail.com', 587, 'tls')
+ * $transport = (new Swift_SmtpTransport('smtp.gmail.com', 587, 'tls'))
  *   ->setAuthMode('XOAUTH2')
  *   ->setUsername('YOUR_EMAIL_ADDRESS')
  *   ->setPassword('YOUR_ACCESS_TOKEN');
@@ -36,25 +36,19 @@ class Swift_Transport_Esmtp_Auth_XOAuth2Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $email and $token.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $email
-     * @param string                    $token
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
     {
         try {
             $param = $this->constructXOAuth2Params($email, $token);
-            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index cb36133c9..53a90a873 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * An ESMTP handler for AUTH support.
+ * An ESMTP handler for AUTH support (RFC 5248).
  *
  * @author Chris Corbyn
  */
@@ -20,35 +20,35 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var Swift_Transport_Esmtp_Authenticator[]
      */
-    private $_authenticators = array();
+    private $authenticators = [];
 
     /**
      * The username for authentication.
      *
      * @var string
      */
-    private $_username;
+    private $username;
 
     /**
      * The password for authentication.
      *
      * @var string
      */
-    private $_password;
+    private $password;
 
     /**
      * The auth mode for authentication.
      *
      * @var string
      */
-    private $_auth_mode;
+    private $auth_mode;
 
     /**
      * The ESMTP AUTH parameters available.
      *
      * @var string[]
      */
-    private $_esmtpParams = array();
+    private $esmtpParams = [];
 
     /**
      * Create a new AuthHandler with $authenticators for support.
@@ -67,7 +67,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setAuthenticators(array $authenticators)
     {
-        $this->_authenticators = $authenticators;
+        $this->authenticators = $authenticators;
     }
 
     /**
@@ -77,7 +77,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getAuthenticators()
     {
-        return $this->_authenticators;
+        return $this->authenticators;
     }
 
     /**
@@ -87,7 +87,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setUsername($username)
     {
-        $this->_username = $username;
+        $this->username = $username;
     }
 
     /**
@@ -97,7 +97,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getUsername()
     {
-        return $this->_username;
+        return $this->username;
     }
 
     /**
@@ -107,7 +107,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setPassword($password)
     {
-        $this->_password = $password;
+        $this->password = $password;
     }
 
     /**
@@ -117,7 +117,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getPassword()
     {
-        return $this->_password;
+        return $this->password;
     }
 
     /**
@@ -127,7 +127,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setAuthMode($mode)
     {
-        $this->_auth_mode = $mode;
+        $this->auth_mode = $mode;
     }
 
     /**
@@ -137,13 +137,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getAuthMode()
     {
-        return $this->_auth_mode;
+        return $this->auth_mode;
     }
 
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword()
     {
@@ -157,7 +157,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setKeywordParams(array $parameters)
     {
-        $this->_esmtpParams = $parameters;
+        $this->esmtpParams = $parameters;
     }
 
     /**
@@ -167,21 +167,28 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function afterEhlo(Swift_Transport_SmtpAgent $agent)
     {
-        if ($this->_username) {
+        if ($this->username) {
             $count = 0;
-            foreach ($this->_getAuthenticatorsForAgent() as $authenticator) {
-                if (in_array(strtolower($authenticator->getAuthKeyword()),
-                    array_map('strtolower', $this->_esmtpParams))) {
+            $errors = [];
+            foreach ($this->getAuthenticatorsForAgent() as $authenticator) {
+                if (\in_array(strtolower($authenticator->getAuthKeyword() ?? ''), array_map('strtolower', $this->esmtpParams))) {
                     ++$count;
-                    if ($authenticator->authenticate($agent, $this->_username, $this->_password)) {
-                        return;
+                    try {
+                        if ($authenticator->authenticate($agent, $this->username, $this->password)) {
+                            return;
+                        }
+                    } catch (Swift_TransportException $e) {
+                        // keep the error message, but tries the other authenticators
+                        $errors[] = [$authenticator->getAuthKeyword(), $e->getMessage()];
                     }
                 }
             }
-            throw new Swift_TransportException(
-                'Failed to authenticate on SMTP server with username "'.
-                $this->_username.'" using '.$count.' possible authenticators'
-                );
+
+            $message = 'Failed to authenticate on SMTP server with username "'.$this->username.'" using '.$count.' possible authenticators.';
+            foreach ($errors as $error) {
+                $message .= ' Authenticator '.$error[0].' returned '.$error[1].'.';
+            }
+            throw new Swift_TransportException($message);
         }
     }
 
@@ -190,7 +197,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getMailParams()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -198,13 +205,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getRcptParams()
     {
-        return array();
+        return [];
     }
 
     /**
      * Not used.
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
     {
     }
 
@@ -229,7 +236,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function exposeMixinMethods()
     {
-        return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+        return ['setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode'];
     }
 
     /**
@@ -242,19 +249,17 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Returns the authenticator list for the given agent.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return array
      */
-    protected function _getAuthenticatorsForAgent()
+    protected function getAuthenticatorsForAgent()
     {
-        if (!$mode = strtolower($this->_auth_mode)) {
-            return $this->_authenticators;
+        if (!$mode = strtolower($this->auth_mode ?? '')) {
+            return $this->authenticators;
         }
 
-        foreach ($this->_authenticators as $authenticator) {
-            if (strtolower($authenticator->getAuthKeyword()) == $mode) {
-                return array($authenticator);
+        foreach ($this->authenticators as $authenticator) {
+            if (strtolower($authenticator->getAuthKeyword() ?? '') == $mode) {
+                return [$authenticator];
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
index 12a9abf81..f692a6fe4 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -25,11 +25,12 @@ interface Swift_Transport_Esmtp_Authenticator
     /**
      * Try to authenticate the user with $username and $password.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
+     * @param string $username
+     * @param string $password
      *
-     * @return bool
+     * @return bool true if authentication worked (returning false is deprecated, throw a Swift_TransportException instead)
+     *
+     * @throws Swift_TransportException Allows the message to bubble up when authentication was not successful
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
new file mode 100644
index 000000000..63f708669
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for 8BITMIME support (RFC 6152).
+ *
+ * 8BITMIME is required when sending 8-bit content to over SMTP, e.g. when using
+ * Swift_Mime_ContentEncoder_PlainContentEncoder in "8bit" mode.
+ *
+ * 8BITMIME mode is enabled unconditionally, even when sending ASCII-only
+ * messages, so it should only be used with an outbound SMTP server that will
+ * convert the message to 7-bit MIME if the next hop does not support 8BITMIME.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_EightBitMimeHandler implements Swift_Transport_EsmtpHandler
+{
+    protected $encoding;
+
+    /**
+     * @param string $encoding The parameter so send with the MAIL FROM command;
+     *                         either "8BITMIME" or "7BIT"
+     */
+    public function __construct(string $encoding = '8BITMIME')
+    {
+        $this->encoding = $encoding;
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return '8BITMIME';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['BODY='.$this->encoding];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
new file mode 100644
index 000000000..7d0252a01
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for SMTPUTF8 support (RFC 6531).
+ *
+ * SMTPUTF8 is required when sending to email addresses containing non-ASCII
+ * characters in local-part (the substring before @). This handler should be
+ * used together with Swift_AddressEncoder_Utf8AddressEncoder.
+ *
+ * SMTPUTF8 mode is enabled unconditionally, even when sending to ASCII-only
+ * addresses, so it should only be used with an outbound SMTP server that will
+ * deliver ASCII-only messages even if the next hop does not support SMTPUTF8.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_SmtpUtf8Handler implements Swift_Transport_EsmtpHandler
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return 'SMTPUTF8';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['SMTPUTF8'];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
index c17ef8feb..b8ea36e2f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -18,7 +18,7 @@ interface Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword();
 
@@ -59,7 +59,7 @@ interface Swift_Transport_EsmtpHandler
      * @param string[]                  $failedRecipients to collect failures
      * @param bool                      $stop             to be set true  by-reference if the command is now sent
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false);
 
     /**
      * Returns +1, -1 or 0 according to the rules for usort().
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 156e2cf5b..36545f51f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      *
      * @var Swift_Transport_EsmtpHandler[]
      */
-    private $_handlers = array();
+    private $handlers = [];
 
     /**
      * ESMTP capabilities.
      *
      * @var string[]
      */
-    private $_capabilities = array();
+    private $capabilities = [];
 
     /**
      * Connection buffer parameters.
      *
      * @var array
      */
-    private $_params = array(
+    private $params = [
         'protocol' => 'tcp',
         'host' => 'localhost',
         'port' => 25,
@@ -42,32 +42,33 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         'blocking' => 1,
         'tls' => false,
         'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
-        'stream_context_options' => array(),
-        );
+        'stream_context_options' => [],
+        ];
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer       $buf
      * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
-     * @param Swift_Events_EventDispatcher   $dispatcher
+     * @param string                         $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher)
+    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
         $this->setExtensionHandlers($extensionHandlers);
     }
 
     /**
      * Set the host to connect to.
      *
+     * Literal IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $host
      *
      * @return $this
      */
     public function setHost($host)
     {
-        $this->_params['host'] = $host;
+        $this->params['host'] = $host;
 
         return $this;
     }
@@ -79,7 +80,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getHost()
     {
-        return $this->_params['host'];
+        return $this->params['host'];
     }
 
     /**
@@ -91,7 +92,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setPort($port)
     {
-        $this->_params['port'] = (int) $port;
+        $this->params['port'] = (int) $port;
 
         return $this;
     }
@@ -103,7 +104,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getPort()
     {
-        return $this->_params['port'];
+        return $this->params['port'];
     }
 
     /**
@@ -115,8 +116,8 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setTimeout($timeout)
     {
-        $this->_params['timeout'] = (int) $timeout;
-        $this->_buffer->setParam('timeout', (int) $timeout);
+        $this->params['timeout'] = (int) $timeout;
+        $this->buffer->setParam('timeout', (int) $timeout);
 
         return $this;
     }
@@ -128,7 +129,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getTimeout()
     {
-        return $this->_params['timeout'];
+        return $this->params['timeout'];
     }
 
     /**
@@ -140,13 +141,13 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setEncryption($encryption)
     {
-        $encryption = strtolower($encryption);
+        $encryption = strtolower($encryption ?? '');
         if ('tls' == $encryption) {
-            $this->_params['protocol'] = 'tcp';
-            $this->_params['tls'] = true;
+            $this->params['protocol'] = 'tcp';
+            $this->params['tls'] = true;
         } else {
-            $this->_params['protocol'] = $encryption;
-            $this->_params['tls'] = false;
+            $this->params['protocol'] = $encryption;
+            $this->params['tls'] = false;
         }
 
         return $this;
@@ -159,7 +160,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getEncryption()
     {
-        return $this->_params['tls'] ? 'tls' : $this->_params['protocol'];
+        return $this->params['tls'] ? 'tls' : $this->params['protocol'];
     }
 
     /**
@@ -171,7 +172,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setStreamOptions($options)
     {
-        $this->_params['stream_context_options'] = $options;
+        $this->params['stream_context_options'] = $options;
 
         return $this;
     }
@@ -183,19 +184,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getStreamOptions()
     {
-        return $this->_params['stream_context_options'];
+        return $this->params['stream_context_options'];
     }
 
     /**
      * Sets the source IP.
      *
+     * IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $source
      *
      * @return $this
      */
     public function setSourceIp($source)
     {
-        $this->_params['sourceIp'] = $source;
+        $this->params['sourceIp'] = $source;
 
         return $this;
     }
@@ -207,7 +210,36 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getSourceIp()
     {
-        return isset($this->_params['sourceIp']) ? $this->_params['sourceIp'] : null;
+        return $this->params['sourceIp'] ?? null;
+    }
+
+    /**
+     * Sets whether SMTP pipelining is enabled.
+     *
+     * By default, support is auto-detected using the PIPELINING SMTP extension.
+     * Use this function to override that in the unlikely event of compatibility
+     * issues.
+     *
+     * @param bool $enabled
+     *
+     * @return $this
+     */
+    public function setPipelining($enabled)
+    {
+        $this->pipelining = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether SMTP pipelining is enabled.
+     *
+     * @return bool|null a boolean if pipelining is explicitly enabled or disabled,
+     *                   or null if support is auto-detected
+     */
+    public function getPipelining()
+    {
+        return $this->pipelining;
     }
 
     /**
@@ -219,14 +251,15 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setExtensionHandlers(array $handlers)
     {
-        $assoc = array();
+        $assoc = [];
         foreach ($handlers as $handler) {
             $assoc[$handler->getHandledKeyword()] = $handler;
         }
-
-        @uasort($assoc, array($this, '_sortHandlers'));
-        $this->_handlers = $assoc;
-        $this->_setHandlerParams();
+        uasort($assoc, function ($a, $b) {
+            return $a->getPriorityOver($b->getHandledKeyword());
+        });
+        $this->handlers = $assoc;
+        $this->setHandlerParams();
 
         return $this;
     }
@@ -238,7 +271,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getExtensionHandlers()
     {
-        return array_values($this->_handlers);
+        return array_values($this->handlers);
     }
 
     /**
@@ -250,15 +283,17 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $stopSignal = false;
         $response = null;
-        foreach ($this->_getActiveHandlers() as $handler) {
+        foreach ($this->getActiveHandlers() as $handler) {
             $response = $handler->onCommand(
                 $this, $command, $codes, $failures, $stopSignal
                 );
@@ -267,19 +302,19 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             }
         }
 
-        return parent::executeCommand($command, $codes, $failures);
+        return parent::executeCommand($command, $codes, $failures, $pipeline, $address);
     }
 
     /** Mixin handling method for ESMTP handlers */
     public function __call($method, $args)
     {
-        foreach ($this->_handlers as $handler) {
-            if (in_array(strtolower($method),
+        foreach ($this->handlers as $handler) {
+            if (\in_array(strtolower($method),
                 array_map('strtolower', (array) $handler->exposeMixinMethods())
                 )) {
-                $return = call_user_func_array(array($handler, $method), $args);
+                $return = \call_user_func_array([$handler, $method], $args);
                 // Allow fluid method calls
-                if (null === $return && substr($method, 0, 3) == 'set') {
+                if (null === $return && 'set' == substr($method, 0, 3)) {
                     return $this;
                 } else {
                     return $return;
@@ -290,89 +325,95 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     }
 
     /** Get the params to initialize the buffer */
-    protected function _getBufferParams()
+    protected function getBufferParams()
     {
-        return $this->_params;
+        return $this->params;
     }
 
     /** Overridden to perform EHLO instead */
-    protected function _doHeloCommand()
+    protected function doHeloCommand()
     {
         try {
             $response = $this->executeCommand(
-                sprintf("EHLO %s\r\n", $this->_domain), array(250)
+                sprintf("EHLO %s\r\n", $this->domain), [250]
                 );
         } catch (Swift_TransportException $e) {
-            return parent::_doHeloCommand();
+            return parent::doHeloCommand();
         }
 
-        if ($this->_params['tls']) {
+        if ($this->params['tls']) {
             try {
-                $this->executeCommand("STARTTLS\r\n", array(220));
+                $this->executeCommand("STARTTLS\r\n", [220]);
 
-                if (!$this->_buffer->startTLS()) {
+                if (!$this->buffer->startTLS()) {
                     throw new Swift_TransportException('Unable to connect with TLS encryption');
                 }
 
                 try {
                     $response = $this->executeCommand(
-                        sprintf("EHLO %s\r\n", $this->_domain), array(250)
+                        sprintf("EHLO %s\r\n", $this->domain), [250]
                         );
                 } catch (Swift_TransportException $e) {
-                    return parent::_doHeloCommand();
+                    return parent::doHeloCommand();
                 }
             } catch (Swift_TransportException $e) {
-                $this->_throwException($e);
+                $this->throwException($e);
             }
         }
 
-        $this->_capabilities = $this->_getCapabilities($response);
-        $this->_setHandlerParams();
-        foreach ($this->_getActiveHandlers() as $handler) {
+        $this->capabilities = $this->getCapabilities($response);
+        if (!isset($this->pipelining)) {
+            $this->pipelining = isset($this->capabilities['PIPELINING']);
+        }
+
+        $this->setHandlerParams();
+        foreach ($this->getActiveHandlers() as $handler) {
             $handler->afterEhlo($this);
         }
     }
 
     /** Overridden to add Extension support */
-    protected function _doMailFromCommand($address)
+    protected function doMailFromCommand($address)
     {
-        $handlers = $this->_getActiveHandlers();
-        $params = array();
+        $address = $this->addressEncoder->encodeString($address);
+        $handlers = $this->getActiveHandlers();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getMailParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
+            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), [250], $failures, true
             );
     }
 
     /** Overridden to add Extension support */
-    protected function _doRcptToCommand($address)
+    protected function doRcptToCommand($address)
     {
-        $handlers = $this->_getActiveHandlers();
-        $params = array();
+        $address = $this->addressEncoder->encodeString($address);
+        $handlers = $this->getActiveHandlers();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getRcptParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Determine ESMTP capabilities by function group */
-    private function _getCapabilities($ehloResponse)
+    private function getCapabilities($ehloResponse)
     {
-        $capabilities = array();
-        $ehloResponse = trim($ehloResponse);
+        $capabilities = [];
+        $ehloResponse = trim($ehloResponse ?? '');
         $lines = explode("\r\n", $ehloResponse);
         array_shift($lines);
         foreach ($lines as $line) {
             if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches)) {
                 $keyword = strtoupper($matches[1]);
                 $paramStr = strtoupper(ltrim($matches[2], ' ='));
-                $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+                $params = !empty($paramStr) ? explode(' ', $paramStr) : [];
                 $capabilities[$keyword] = $params;
             }
         }
@@ -381,31 +422,25 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     }
 
     /** Set parameters which are used by each extension handler */
-    private function _setHandlerParams()
+    private function setHandlerParams()
     {
-        foreach ($this->_handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->_capabilities)) {
-                $handler->setKeywordParams($this->_capabilities[$keyword]);
+        foreach ($this->handlers as $keyword => $handler) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
+                $handler->setKeywordParams($this->capabilities[$keyword]);
             }
         }
     }
 
     /** Get ESMTP handlers which are currently ok to use */
-    private function _getActiveHandlers()
+    private function getActiveHandlers()
     {
-        $handlers = array();
-        foreach ($this->_handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->_capabilities)) {
+        $handlers = [];
+        foreach ($this->handlers as $keyword => $handler) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
                 $handlers[] = $handler;
             }
         }
 
         return $handlers;
     }
-
-    /** Custom sort for extension handler ordering */
-    private function _sortHandlers($a, $b)
-    {
-        return $a->getPriorityOver($b->getHandledKeyword());
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
index 311a0f2ad..1a4b4754f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -20,7 +20,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      *
      * @var Swift_Transport
      */
-    private $_currentTransport;
+    private $currentTransport;
 
     // needed as __construct is called from elsewhere explicitly
     public function __construct()
@@ -28,61 +28,76 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
         parent::__construct();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        $maxTransports = \count($this->transports);
+        for ($i = 0; $i < $maxTransports
+            && $transport = $this->getNextTransport(); ++$i) {
+            if ($transport->ping()) {
+                return true;
+            } else {
+                $this->killCurrentTransport();
+            }
+        }
+
+        return \count($this->transports) > 0;
+    }
+
     /**
      * Send the given Message.
      *
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->_transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
-        $this->_lastUsedTransport = null;
+        $this->lastUsedTransport = null;
 
         for ($i = 0; $i < $maxTransports
-            && $transport = $this->_getNextTransport(); ++$i) {
+            && $transport = $this->getNextTransport(); ++$i) {
             try {
                 if (!$transport->isStarted()) {
                     $transport->start();
                 }
 
                 if ($sent = $transport->send($message, $failedRecipients)) {
-                    $this->_lastUsedTransport = $transport;
+                    $this->lastUsedTransport = $transport;
 
                     return $sent;
                 }
             } catch (Swift_TransportException $e) {
-                $this->_killCurrentTransport();
+                $this->killCurrentTransport();
             }
         }
 
-        if (count($this->_transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in FailoverTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in FailoverTransport failed, or no Transports available');
         }
 
         return $sent;
     }
 
-    protected function _getNextTransport()
+    protected function getNextTransport()
     {
-        if (!isset($this->_currentTransport)) {
-            $this->_currentTransport = parent::_getNextTransport();
+        if (!isset($this->currentTransport)) {
+            $this->currentTransport = parent::getNextTransport();
         }
 
-        return $this->_currentTransport;
+        return $this->currentTransport;
     }
 
-    protected function _killCurrentTransport()
+    protected function killCurrentTransport()
     {
-        $this->_currentTransport = null;
-        parent::_killCurrentTransport();
+        $this->currentTransport = null;
+        parent::killCurrentTransport();
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
index af97adf1f..50f1e5e40 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
@@ -25,8 +25,6 @@ interface Swift_Transport_IoBuffer extends Swift_InputByteStream, Swift_OutputBy
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
index e2adc567e..0b5ba9d30 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @var Swift_Transport[]
      */
-    private $_deadTransports = array();
+    private $deadTransports = [];
 
     /**
      * The Transports which are used in rotation.
      *
      * @var Swift_Transport[]
      */
-    protected $_transports = array();
+    protected $transports = [];
 
     /**
      * The Transport used in the last successful send operation.
      *
      * @var Swift_Transport
      */
-    protected $_lastUsedTransport = null;
+    protected $lastUsedTransport = null;
 
     // needed as __construct is called from elsewhere explicitly
     public function __construct()
@@ -48,8 +48,8 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function setTransports(array $transports)
     {
-        $this->_transports = $transports;
-        $this->_deadTransports = array();
+        $this->transports = $transports;
+        $this->deadTransports = [];
     }
 
     /**
@@ -59,7 +59,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function getTransports()
     {
-        return array_merge($this->_transports, $this->_deadTransports);
+        return array_merge($this->transports, $this->deadTransports);
     }
 
     /**
@@ -69,7 +69,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function getLastUsedTransport()
     {
-        return $this->_lastUsedTransport;
+        return $this->lastUsedTransport;
     }
 
     /**
@@ -79,7 +79,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function isStarted()
     {
-        return count($this->_transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -87,7 +87,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function start()
     {
-        $this->_transports = array_merge($this->_transports, $this->_deadTransports);
+        $this->transports = array_merge($this->transports, $this->deadTransports);
     }
 
     /**
@@ -95,47 +95,58 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function stop()
     {
-        foreach ($this->_transports as $transport) {
+        foreach ($this->transports as $transport) {
             $transport->stop();
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        foreach ($this->transports as $transport) {
+            if (!$transport->ping()) {
+                $this->killCurrentTransport();
+            }
+        }
+
+        return \count($this->transports) > 0;
+    }
+
     /**
      * Send the given Message.
      *
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->_transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
-        $this->_lastUsedTransport = null;
+        $this->lastUsedTransport = null;
 
         for ($i = 0; $i < $maxTransports
-            && $transport = $this->_getNextTransport(); ++$i) {
+            && $transport = $this->getNextTransport(); ++$i) {
             try {
                 if (!$transport->isStarted()) {
                     $transport->start();
                 }
                 if ($sent = $transport->send($message, $failedRecipients)) {
-                    $this->_lastUsedTransport = $transport;
+                    $this->lastUsedTransport = $transport;
                     break;
                 }
             } catch (Swift_TransportException $e) {
-                $this->_killCurrentTransport();
+                $this->killCurrentTransport();
             }
         }
 
-        if (count($this->_transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in LoadBalancedTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in LoadBalancedTransport failed, or no Transports available');
         }
 
         return $sent;
@@ -143,12 +154,10 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        foreach ($this->_transports as $transport) {
+        foreach ($this->transports as $transport) {
             $transport->registerPlugin($plugin);
         }
     }
@@ -158,10 +167,10 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @return Swift_Transport
      */
-    protected function _getNextTransport()
+    protected function getNextTransport()
     {
-        if ($next = array_shift($this->_transports)) {
-            $this->_transports[] = $next;
+        if ($next = array_shift($this->transports)) {
+            $this->transports[] = $next;
         }
 
         return $next;
@@ -170,14 +179,14 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
     /**
      * Tag the currently used (top of stack) transport as dead/useless.
      */
-    protected function _killCurrentTransport()
+    protected function killCurrentTransport()
     {
-        if ($transport = array_pop($this->_transports)) {
+        if ($transport = array_pop($this->transports)) {
             try {
                 $transport->stop();
             } catch (Exception $e) {
             }
-            $this->_deadTransports[] = $transport;
+            $this->deadTransports[] = $transport;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
deleted file mode 100644
index 77489cedc..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This interface intercepts calls to the mail() function.
- *
- * @author     Chris Corbyn
- */
-interface Swift_Transport_MailInvoker
-{
-    /**
-     * Send mail via the mail() function.
-     *
-     * This method takes the same arguments as PHP mail().
-     *
-     * @param string $to
-     * @param string $subject
-     * @param string $body
-     * @param string $headers
-     * @param string $extraParams
-     *
-     * @return bool
-     */
-    public function mail($to, $subject, $body, $headers = null, $extraParams = null);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
deleted file mode 100644
index 48ef4a702..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Sends Messages using the mail() function.
- *
- * It is advised that users do not use this transport if at all possible
- * since a number of plugin features cannot be used in conjunction with this
- * transport due to the internal interface in PHP itself.
- *
- * The level of error reporting with this transport is incredibly weak, again
- * due to limitations of PHP's internal mail() function.  You'll get an
- * all-or-nothing result from sending.
- *
- * @author Chris Corbyn
- *
- * @deprecated since 5.4.5 (to be removed in 6.0)
- */
-class Swift_Transport_MailTransport implements Swift_Transport
-{
-    /** Additional parameters to pass to mail() */
-    private $_extraParams = '-f%s';
-
-    /** The event dispatcher from the plugin API */
-    private $_eventDispatcher;
-
-    /** An invoker that calls the mail() function */
-    private $_invoker;
-
-    /**
-     * Create a new MailTransport with the $log.
-     *
-     * @param Swift_Transport_MailInvoker  $invoker
-     * @param Swift_Events_EventDispatcher $eventDispatcher
-     */
-    public function __construct(Swift_Transport_MailInvoker $invoker, Swift_Events_EventDispatcher $eventDispatcher)
-    {
-        @trigger_error(sprintf('The %s class is deprecated since version 5.4.5 and will be removed in 6.0. Use the Sendmail or SMTP transport instead.', __CLASS__), E_USER_DEPRECATED);
-
-        $this->_invoker = $invoker;
-        $this->_eventDispatcher = $eventDispatcher;
-    }
-
-    /**
-     * Not used.
-     */
-    public function isStarted()
-    {
-        return false;
-    }
-
-    /**
-     * Not used.
-     */
-    public function start()
-    {
-    }
-
-    /**
-     * Not used.
-     */
-    public function stop()
-    {
-    }
-
-    /**
-     * Set the additional parameters used on the mail() function.
-     *
-     * This string is formatted for sprintf() where %s is the sender address.
-     *
-     * @param string $params
-     *
-     * @return $this
-     */
-    public function setExtraParams($params)
-    {
-        $this->_extraParams = $params;
-
-        return $this;
-    }
-
-    /**
-     * Get the additional parameters used on the mail() function.
-     *
-     * This string is formatted for sprintf() where %s is the sender address.
-     *
-     * @return string
-     */
-    public function getExtraParams()
-    {
-        return $this->_extraParams;
-    }
-
-    /**
-     * Send the given Message.
-     *
-     * Recipient/sender data will be retrieved from the Message API.
-     * The return value is the number of recipients who were accepted for delivery.
-     *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
-     *
-     * @return int
-     */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-    {
-        $failedRecipients = (array) $failedRecipients;
-
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-            if ($evt->bubbleCancelled()) {
-                return 0;
-            }
-        }
-
-        $count = (
-            count((array) $message->getTo())
-            + count((array) $message->getCc())
-            + count((array) $message->getBcc())
-            );
-
-        $toHeader = $message->getHeaders()->get('To');
-        $subjectHeader = $message->getHeaders()->get('Subject');
-
-        if (0 === $count) {
-            $this->_throwException(new Swift_TransportException('Cannot send message without a recipient'));
-        }
-        $to = $toHeader ? $toHeader->getFieldBody() : '';
-        $subject = $subjectHeader ? $subjectHeader->getFieldBody() : '';
-
-        $reversePath = $this->_getReversePath($message);
-
-        // Remove headers that would otherwise be duplicated
-        $message->getHeaders()->remove('To');
-        $message->getHeaders()->remove('Subject');
-
-        $messageStr = $message->toString();
-
-        if ($toHeader) {
-            $message->getHeaders()->set($toHeader);
-        }
-        $message->getHeaders()->set($subjectHeader);
-
-        // Separate headers from body
-        if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n")) {
-            $headers = substr($messageStr, 0, $endHeaders)."\r\n"; //Keep last EOL
-            $body = substr($messageStr, $endHeaders + 4);
-        } else {
-            $headers = $messageStr."\r\n";
-            $body = '';
-        }
-
-        unset($messageStr);
-
-        if ("\r\n" != PHP_EOL) {
-            // Non-windows (not using SMTP)
-            $headers = str_replace("\r\n", PHP_EOL, $headers);
-            $subject = str_replace("\r\n", PHP_EOL, $subject);
-            $body = str_replace("\r\n", PHP_EOL, $body);
-            $to = str_replace("\r\n", PHP_EOL, $to);
-        } else {
-            // Windows, using SMTP
-            $headers = str_replace("\r\n.", "\r\n..", $headers);
-            $subject = str_replace("\r\n.", "\r\n..", $subject);
-            $body = str_replace("\r\n.", "\r\n..", $body);
-            $to = str_replace("\r\n.", "\r\n..", $to);
-        }
-
-        if ($this->_invoker->mail($to, $subject, $body, $headers, $this->_formatExtraParams($this->_extraParams, $reversePath))) {
-            if ($evt) {
-                $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-                $evt->setFailedRecipients($failedRecipients);
-                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-            }
-        } else {
-            $failedRecipients = array_merge(
-                $failedRecipients,
-                array_keys((array) $message->getTo()),
-                array_keys((array) $message->getCc()),
-                array_keys((array) $message->getBcc())
-                );
-
-            if ($evt) {
-                $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
-                $evt->setFailedRecipients($failedRecipients);
-                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-            }
-
-            $message->generateId();
-
-            $count = 0;
-        }
-
-        return $count;
-    }
-
-    /**
-     * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
-     */
-    public function registerPlugin(Swift_Events_EventListener $plugin)
-    {
-        $this->_eventDispatcher->bindEventListener($plugin);
-    }
-
-    /** Throw a TransportException, first sending it to any listeners */
-    protected function _throwException(Swift_TransportException $e)
-    {
-        if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
-            if (!$evt->bubbleCancelled()) {
-                throw $e;
-            }
-        } else {
-            throw $e;
-        }
-    }
-
-    /** Determine the best-use reverse path for this message */
-    private function _getReversePath(Swift_Mime_Message $message)
-    {
-        $return = $message->getReturnPath();
-        $sender = $message->getSender();
-        $from = $message->getFrom();
-        $path = null;
-        if (!empty($return)) {
-            $path = $return;
-        } elseif (!empty($sender)) {
-            $keys = array_keys($sender);
-            $path = array_shift($keys);
-        } elseif (!empty($from)) {
-            $keys = array_keys($from);
-            $path = array_shift($keys);
-        }
-
-        return $path;
-    }
-
-    /**
-     * Fix CVE-2016-10074 by disallowing potentially unsafe shell characters.
-     *
-     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
-     *
-     * @param string $string The string to be validated
-     *
-     * @return bool
-     */
-    private function _isShellSafe($string)
-    {
-        // Future-proof
-        if (escapeshellcmd($string) !== $string || !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))) {
-            return false;
-        }
-
-        $length = strlen($string);
-        for ($i = 0; $i < $length; ++$i) {
-            $c = $string[$i];
-            // All other characters have a special meaning in at least one common shell, including = and +.
-            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
-            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
-            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Return php mail extra params to use for invoker->mail.
-     *
-     * @param $extraParams
-     * @param $reversePath
-     *
-     * @return string|null
-     */
-    private function _formatExtraParams($extraParams, $reversePath)
-    {
-        if (false !== strpos($extraParams, '-f%s')) {
-            if (empty($reversePath) || false === $this->_isShellSafe($reversePath)) {
-                $extraParams = str_replace('-f%s', '', $extraParams);
-            } else {
-                $extraParams = sprintf($extraParams, $reversePath);
-            }
-        }
-
-        return !empty($extraParams) ? $extraParams : null;
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
index ad20e0e53..7d910db5a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -16,14 +16,14 @@
 class Swift_Transport_NullTransport implements Swift_Transport
 {
     /** The event dispatcher from the plugin API */
-    private $_eventDispatcher;
+    private $eventDispatcher;
 
     /**
      * Constructor.
      */
     public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
     {
-        $this->_eventDispatcher = $eventDispatcher;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -50,18 +50,25 @@ class Swift_Transport_NullTransport implements Swift_Transport
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        return true;
+    }
+
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent emails
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
             if ($evt->bubbleCancelled()) {
                 return 0;
             }
@@ -69,13 +76,13 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
         if ($evt) {
             $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
         $count = (
-            count((array) $message->getTo())
-            + count((array) $message->getCc())
-            + count((array) $message->getBcc())
+            \count((array) $message->getTo())
+            + \count((array) $message->getCc())
+            + \count((array) $message->getBcc())
             );
 
         return $count;
@@ -83,11 +90,9 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_eventDispatcher->bindEventListener($plugin);
+        $this->eventDispatcher->bindEventListener($plugin);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 6430d5f6b..65a434d11 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -24,22 +24,21 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      *
      * @var array
      */
-    private $_params = array(
+    private $params = [
         'timeout' => 30,
         'blocking' => 1,
         'command' => '/usr/sbin/sendmail -bs',
         'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
-        );
+        ];
 
     /**
      * Create a new SendmailTransport with $buf for I/O.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher)
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
     }
 
     /**
@@ -68,7 +67,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      */
     public function setCommand($command)
     {
-        $this->_params['command'] = $command;
+        $this->params['command'] = $command;
 
         return $this;
     }
@@ -80,7 +79,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      */
     public function getCommand()
     {
-        return $this->_params['command'];
+        return $this->params['command'];
     }
 
     /**
@@ -92,12 +91,11 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      * NOTE: If using 'sendmail -t' you will not be aware of any failures until
      * they bounce (i.e. send() will always return 100% success).
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
         $failedRecipients = (array) $failedRecipients;
         $command = $this->getCommand();
@@ -105,45 +103,45 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
         $count = 0;
 
         if (false !== strpos($command, ' -t')) {
-            if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+            if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+                $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
                 if ($evt->bubbleCancelled()) {
                     return 0;
                 }
             }
 
             if (false === strpos($command, ' -f')) {
-                $command .= ' -f'.escapeshellarg($this->_getReversePath($message));
+                $command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
             }
 
-            $buffer->initialize(array_merge($this->_params, array('command' => $command)));
+            $buffer->initialize(array_merge($this->params, ['command' => $command]));
 
             if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
-                $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+                $buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
             } else {
-                $buffer->setWriteTranslations(array("\r\n" => "\n"));
+                $buffer->setWriteTranslations(["\r\n" => "\n"]);
             }
 
-            $count = count((array) $message->getTo())
-                + count((array) $message->getCc())
-                + count((array) $message->getBcc())
+            $count = \count((array) $message->getTo())
+                + \count((array) $message->getCc())
+                + \count((array) $message->getBcc())
                 ;
             $message->toByteStream($buffer);
             $buffer->flushBuffers();
-            $buffer->setWriteTranslations(array());
+            $buffer->setWriteTranslations([]);
             $buffer->terminate();
 
             if ($evt) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
                 $evt->setFailedRecipients($failedRecipients);
-                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+                $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
             }
 
             $message->generateId();
         } elseif (false !== strpos($command, ' -bs')) {
             $count = parent::send($message, $failedRecipients);
         } else {
-            $this->_throwException(new Swift_TransportException(
+            $this->throwException(new Swift_TransportException(
                 'Unsupported sendmail command flags ['.$command.']. '.
                 'Must be one of "-bs" or "-t" but can include additional flags.'
                 ));
@@ -153,8 +151,8 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
     }
 
     /** Get the params to initialize the buffer */
-    protected function _getBufferParams()
+    protected function getBufferParams()
     {
-        return $this->_params;
+        return $this->params;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
deleted file mode 100644
index 4cab66bd6..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This is the implementation class for {@link Swift_Transport_MailInvoker}.
- *
- * @author     Chris Corbyn
- */
-class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
-{
-    /**
-     * Send mail via the mail() function.
-     *
-     * This method takes the same arguments as PHP mail().
-     *
-     * @param string $to
-     * @param string $subject
-     * @param string $body
-     * @param string $headers
-     * @param string $extraParams
-     *
-     * @return bool
-     */
-    public function mail($to, $subject, $body, $headers = null, $extraParams = null)
-    {
-        if (!ini_get('safe_mode')) {
-            return @mail($to, $subject, $body, $headers, $extraParams);
-        }
-
-        return @mail($to, $subject, $body, $headers);
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
index 90e913f8e..e8ce65c26 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
@@ -32,5 +32,5 @@ interface Swift_Transport_SmtpAgent
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
      */
-    public function executeCommand($command, $codes = array(), &$failures = null);
+    public function executeCommand($command, $codes = [], &$failures = null);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index e4b87f347..0cb6a5b80 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -16,30 +16,28 @@
 class Swift_Transport_SpoolTransport implements Swift_Transport
 {
     /** The spool instance */
-    private $_spool;
+    private $spool;
 
     /** The event dispatcher from the plugin API */
-    private $_eventDispatcher;
+    private $eventDispatcher;
 
     /**
      * Constructor.
      */
     public function __construct(Swift_Events_EventDispatcher $eventDispatcher, Swift_Spool $spool = null)
     {
-        $this->_eventDispatcher = $eventDispatcher;
-        $this->_spool = $spool;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->spool = $spool;
     }
 
     /**
      * Sets the spool object.
      *
-     * @param Swift_Spool $spool
-     *
      * @return $this
      */
     public function setSpool(Swift_Spool $spool)
     {
-        $this->_spool = $spool;
+        $this->spool = $spool;
 
         return $this;
     }
@@ -51,7 +49,7 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
      */
     public function getSpool()
     {
-        return $this->_spool;
+        return $this->spool;
     }
 
     /**
@@ -78,28 +76,35 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        return true;
+    }
+
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent e-mail's
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
             if ($evt->bubbleCancelled()) {
                 return 0;
             }
         }
 
-        $success = $this->_spool->queueMessage($message);
+        $success = $this->spool->queueMessage($message);
 
         if ($evt) {
             $evt->setResult($success ? Swift_Events_SendEvent::RESULT_SPOOLED : Swift_Events_SendEvent::RESULT_FAILED);
-            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
         return 1;
@@ -107,11 +112,9 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_eventDispatcher->bindEventListener($plugin);
+        $this->eventDispatcher->bindEventListener($plugin);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index 3a9fe76b2..70782ada0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -11,55 +11,51 @@
 /**
  * A generic IoBuffer implementation supporting remote sockets and local processes.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_Transport_IoBuffer
 {
     /** A primary socket */
-    private $_stream;
+    private $stream;
 
     /** The input stream */
-    private $_in;
+    private $in;
 
     /** The output stream */
-    private $_out;
+    private $out;
 
     /** Buffer initialization parameters */
-    private $_params = array();
+    private $params = [];
 
     /** The ReplacementFilterFactory */
-    private $_replacementFactory;
+    private $replacementFactory;
 
     /** Translations performed on data being streamed into the buffer */
-    private $_translations = array();
+    private $translations = [];
 
     /**
      * Create a new StreamBuffer using $replacementFactory for transformations.
-     *
-     * @param Swift_ReplacementFilterFactory $replacementFactory
      */
     public function __construct(Swift_ReplacementFilterFactory $replacementFactory)
     {
-        $this->_replacementFactory = $replacementFactory;
+        $this->replacementFactory = $replacementFactory;
     }
 
     /**
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params)
     {
-        $this->_params = $params;
+        $this->params = $params;
         switch ($params['type']) {
             case self::TYPE_PROCESS:
-                $this->_establishProcessConnection();
+                $this->establishProcessConnection();
                 break;
             case self::TYPE_SOCKET:
             default:
-                $this->_establishSocketConnection();
+                $this->establishSocketConnection();
                 break;
         }
     }
@@ -72,21 +68,21 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      */
     public function setParam($param, $value)
     {
-        if (isset($this->_stream)) {
+        if (isset($this->stream)) {
             switch ($param) {
                 case 'timeout':
-                    if ($this->_stream) {
-                        stream_set_timeout($this->_stream, $value);
+                    if ($this->stream) {
+                        stream_set_timeout($this->stream, $value);
                     }
                     break;
 
                 case 'blocking':
-                    if ($this->_stream) {
-                        stream_set_blocking($this->_stream, 1);
+                    if ($this->stream) {
+                        stream_set_blocking($this->stream, 1);
                     }
             }
         }
-        $this->_params[$param] = $value;
+        $this->params[$param] = $value;
     }
 
     public function startTLS()
@@ -95,12 +91,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
         // To support modern tls we allow explicit tls1.0, tls1.1, tls1.2
         // Ssl3 and older are not allowed because they are vulnerable
         // @TODO make tls arguments configurable
-        $cryptoType = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-        if (PHP_VERSION_ID >= 50600) {
-            $cryptoType = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-        }
-
-        return stream_socket_enable_crypto($this->_stream, true, $cryptoType);
+        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     }
 
     /**
@@ -108,22 +99,22 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      */
     public function terminate()
     {
-        if (isset($this->_stream)) {
-            switch ($this->_params['type']) {
+        if (isset($this->stream)) {
+            switch ($this->params['type']) {
                 case self::TYPE_PROCESS:
-                    fclose($this->_in);
-                    fclose($this->_out);
-                    proc_close($this->_stream);
+                    fclose($this->in);
+                    fclose($this->out);
+                    proc_close($this->stream);
                     break;
                 case self::TYPE_SOCKET:
                 default:
-                    fclose($this->_stream);
+                    fclose($this->stream);
                     break;
             }
         }
-        $this->_stream = null;
-        $this->_out = null;
-        $this->_in = null;
+        $this->stream = null;
+        $this->out = null;
+        $this->in = null;
     }
 
     /**
@@ -136,19 +127,19 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      */
     public function setWriteTranslations(array $replacements)
     {
-        foreach ($this->_translations as $search => $replace) {
+        foreach ($this->translations as $search => $replace) {
             if (!isset($replacements[$search])) {
                 $this->removeFilter($search);
-                unset($this->_translations[$search]);
+                unset($this->translations[$search]);
             }
         }
 
         foreach ($replacements as $search => $replace) {
-            if (!isset($this->_translations[$search])) {
+            if (!isset($this->translations[$search])) {
                 $this->addFilter(
-                    $this->_replacementFactory->createFilter($search, $replace), $search
+                    $this->replacementFactory->createFilter($search, $replace), $search
                     );
-                $this->_translations[$search] = true;
+                $this->translations[$search] = true;
             }
         }
     }
@@ -161,22 +152,18 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      *
      * @param int $sequence of last write to scan from
      *
-     * @throws Swift_IoException
-     *
      * @return string
+     *
+     * @throws Swift_IoException
      */
     public function readLine($sequence)
     {
-        if (isset($this->_out) && !feof($this->_out)) {
-            $line = fgets($this->_out);
-            if (strlen($line) == 0) {
-                $metas = stream_get_meta_data($this->_out);
+        if (isset($this->out) && !feof($this->out)) {
+            $line = fgets($this->out);
+            if (0 == \strlen($line)) {
+                $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->_getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -193,22 +180,18 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      *
      * @param int $length
      *
-     * @throws Swift_IoException
-     *
      * @return string|bool
+     *
+     * @throws Swift_IoException
      */
     public function read($length)
     {
-        if (isset($this->_out) && !feof($this->_out)) {
-            $ret = fread($this->_out, $length);
-            if (strlen($ret) == 0) {
-                $metas = stream_get_meta_data($this->_out);
+        if (isset($this->out) && !feof($this->out)) {
+            $ret = fread($this->out, $length);
+            if (0 == \strlen($ret)) {
+                $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->_getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -222,22 +205,22 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     }
 
     /** Flush the stream contents */
-    protected function _flush()
+    protected function flush()
     {
-        if (isset($this->_in)) {
-            fflush($this->_in);
+        if (isset($this->in)) {
+            fflush($this->in);
         }
     }
 
     /** Write this bytes to the stream */
-    protected function _commit($bytes)
+    protected function doCommit($bytes)
     {
-        if (isset($this->_in)) {
-            $bytesToWrite = strlen($bytes);
+        if (isset($this->in)) {
+            $bytesToWrite = \strlen($bytes);
             $totalBytesWritten = 0;
 
             while ($totalBytesWritten < $bytesToWrite) {
-                $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
+                $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));
                 if (false === $bytesWritten || 0 === $bytesWritten) {
                     break;
                 }
@@ -246,7 +229,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
             }
 
             if ($totalBytesWritten > 0) {
-                return ++$this->_sequence;
+                return ++$this->sequence;
             }
         }
     }
@@ -254,78 +237,80 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     /**
      * Establishes a connection to a remote server.
      */
-    private function _establishSocketConnection()
+    private function establishSocketConnection()
     {
-        $host = $this->_params['host'];
-        if (!empty($this->_params['protocol'])) {
-            $host = $this->_params['protocol'].'://'.$host;
+        $host = $this->params['host'];
+        if (!empty($this->params['protocol'])) {
+            $host = $this->params['protocol'].'://'.$host;
         }
         $timeout = 15;
-        if (!empty($this->_params['timeout'])) {
-            $timeout = $this->_params['timeout'];
+        if (!empty($this->params['timeout'])) {
+            $timeout = $this->params['timeout'];
         }
-        $options = array();
-        if (!empty($this->_params['sourceIp'])) {
-            $options['socket']['bindto'] = $this->_params['sourceIp'].':0';
+        $options = [];
+        if (!empty($this->params['sourceIp'])) {
+            $options['socket']['bindto'] = $this->params['sourceIp'].':0';
         }
-        if (isset($this->_params['stream_context_options'])) {
-            $options = array_merge($options, $this->_params['stream_context_options']);
+
+        if (isset($this->params['stream_context_options'])) {
+            $options = array_merge($options, $this->params['stream_context_options']);
         }
         $streamContext = stream_context_create($options);
-        $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
-        if (false === $this->_stream) {
-            throw new Swift_TransportException(
-                'Connection could not be established with host '.$this->_params['host'].
-                ' ['.$errstr.' #'.$errno.']'
-                );
+
+        set_error_handler(function ($type, $msg) {
+            throw new Swift_TransportException('Connection could not be established with host '.$this->params['host'].' :'.$msg);
+        });
+        try {
+            $this->stream = stream_socket_client($host.':'.$this->params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        } finally {
+            restore_error_handler();
         }
-        if (!empty($this->_params['blocking'])) {
-            stream_set_blocking($this->_stream, 1);
+
+        if (!empty($this->params['blocking'])) {
+            stream_set_blocking($this->stream, 1);
         } else {
-            stream_set_blocking($this->_stream, 0);
+            stream_set_blocking($this->stream, 0);
         }
-        stream_set_timeout($this->_stream, $timeout);
-        $this->_in = &$this->_stream;
-        $this->_out = &$this->_stream;
+        stream_set_timeout($this->stream, $timeout);
+        $this->in = &$this->stream;
+        $this->out = &$this->stream;
     }
 
     /**
      * Opens a process for input/output.
      */
-    private function _establishProcessConnection()
+    private function establishProcessConnection()
     {
-        $command = $this->_params['command'];
-        $descriptorSpec = array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-            );
-        $pipes = array();
-        $this->_stream = proc_open($command, $descriptorSpec, $pipes);
+        $command = $this->params['command'];
+        $descriptorSpec = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+            ];
+        $pipes = [];
+        $this->stream = proc_open($command, $descriptorSpec, $pipes);
         stream_set_blocking($pipes[2], 0);
         if ($err = stream_get_contents($pipes[2])) {
-            throw new Swift_TransportException(
-                'Process could not be started ['.$err.']'
-                );
+            throw new Swift_TransportException('Process could not be started ['.$err.']');
         }
-        $this->_in = &$pipes[0];
-        $this->_out = &$pipes[1];
+        $this->in = &$pipes[0];
+        $this->out = &$pipes[1];
     }
 
-    private function _getReadConnectionDescription()
+    private function getReadConnectionDescription()
     {
-        switch ($this->_params['type']) {
+        switch ($this->params['type']) {
             case self::TYPE_PROCESS:
-                return 'Process '.$this->_params['command'];
+                return 'Process '.$this->params['command'];
                 break;
 
             case self::TYPE_SOCKET:
             default:
-                $host = $this->_params['host'];
-                if (!empty($this->_params['protocol'])) {
-                    $host = $this->_params['protocol'].'://'.$host;
+                $host = $this->params['host'];
+                if (!empty($this->params['protocol'])) {
+                    $host = $this->params['protocol'].'://'.$host;
                 }
-                $host .= ':'.$this->_params['port'];
+                $host .= ':'.$this->params['port'];
 
                 return $host;
                 break;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
index 4ae2412e6..c7417455b 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
@@ -18,9 +18,8 @@ class Swift_TransportException extends Swift_IoException
     /**
      * Create a new TransportException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
deleted file mode 100644
index e16c212c4..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility Class allowing users to simply check expressions again Swift Grammar.
- *
- * @author  Xavier De Cock <xdecock@gmail.com>
- */
-class Swift_Validate
-{
-    /**
-     * Grammar Object.
-     *
-     * @var Swift_Mime_Grammar
-     */
-    private static $grammar = null;
-
-    /**
-     * Checks if an e-mail address matches the current grammars.
-     *
-     * @param string $email
-     *
-     * @return bool
-     */
-    public static function email($email)
-    {
-        if (self::$grammar === null) {
-            self::$grammar = Swift_DependencyContainer::getInstance()
-                ->lookup('mime.grammar');
-        }
-
-        return (bool) preg_match(
-                '/^'.self::$grammar->getDefinition('addr-spec').'$/D',
-                $email
-            );
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php b/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
index 6023448e8..9d94d7740 100644
--- a/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
+++ b/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
@@ -12,11 +12,11 @@ Swift_DependencyContainer::getInstance()
 
     ->register('cache.array')
     ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-    ->withDependencies(array('cache.inputstream'))
+    ->withDependencies(['cache.inputstream'])
 
     ->register('cache.disk')
     ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-    ->withDependencies(array('cache.inputstream', 'tempdir'))
+    ->withDependencies(['cache.inputstream', 'tempdir'])
 
     ->register('cache.inputstream')
     ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
diff --git a/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php b/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
index d575e4f2d..307756c89 100644
--- a/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -6,96 +6,112 @@ Swift_DependencyContainer::getInstance()
     ->register('properties.charset')
     ->asValue('utf-8')
 
-    ->register('mime.grammar')
-    ->asSharedInstanceOf('Swift_Mime_Grammar')
+    ->register('email.validator')
+    ->asSharedInstanceOf('Egulias\EmailValidator\EmailValidator')
+
+    ->register('mime.idgenerator.idright')
+    // As SERVER_NAME can come from the user in certain configurations, check that
+    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+
+    ->register('mime.idgenerator')
+    ->asSharedInstanceOf('Swift_Mime_IdGenerator')
+    ->withDependencies([
+        'mime.idgenerator.idright',
+    ])
 
     ->register('mime.message')
     ->asNewInstanceOf('Swift_Mime_SimpleMessage')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.part')
     ->asNewInstanceOf('Swift_Mime_MimePart')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.attachment')
     ->asNewInstanceOf('Swift_Mime_Attachment')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
-        'mime.grammar',
-    ))
+        'mime.idgenerator',
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.embeddedfile')
     ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
-        'mime.grammar',
-    ))
+        'mime.idgenerator',
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.headerfactory')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-    ->withDependencies(array(
-            'mime.qpheaderencoder',
-            'mime.rfc2231encoder',
-            'mime.grammar',
-            'properties.charset',
-        ))
+    ->withDependencies([
+        'mime.qpheaderencoder',
+        'mime.rfc2231encoder',
+        'email.validator',
+        'properties.charset',
+        'address.idnaddressencoder',
+    ])
 
     ->register('mime.headerset')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-    ->withDependencies(array('mime.headerfactory', 'properties.charset'))
+    ->withDependencies(['mime.headerfactory', 'properties.charset'])
 
     ->register('mime.qpheaderencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.base64headerencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.charstream')
     ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-    ->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+    ->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
 
     ->register('mime.bytecanonicalizer')
     ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-    ->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
-    ->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+    ->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
+    ->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
 
     ->register('mime.characterreaderfactory')
     ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
 
+    ->register('mime.textcontentencoder')
+    ->asAliasOf('mime.qpcontentencoder')
+
     ->register('mime.safeqpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-    ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+    ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
 
     ->register('mime.rawcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
 
     ->register('mime.nativeqpcontentencoder')
-    ->withDependencies(array('properties.charset'))
+    ->withDependencies(['properties.charset'])
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
 
-    ->register('mime.qpcontentencoderproxy')
+    ->register('mime.qpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
-    ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
+    ->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
 
     ->register('mime.7bitcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
@@ -112,12 +128,7 @@ Swift_DependencyContainer::getInstance()
 
     ->register('mime.rfc2231encoder')
     ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-    ->withDependencies(array('mime.charstream'))
-
-    // As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
-    // see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
-    ->register('mime.qpcontentencoder')
-    ->asAliasOf(PHP_VERSION_ID >= 50407 ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
+    ->withDependencies(['mime.charstream'])
 ;
 
 unset($swift_mime_types);
diff --git a/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php b/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
index 77e432cfa..34a63c78e 100644
--- a/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
+++ b/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
@@ -1,24 +1,29 @@
 <?php
 
 Swift_DependencyContainer::getInstance()
+    ->register('transport.localdomain')
+    // As SERVER_NAME can come from the user in certain configurations, check that
+    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+
     ->register('transport.smtp')
     ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
-        array('transport.authhandler'),
+        'transport.smtphandlers',
         'transport.eventdispatcher',
-    ))
+        'transport.localdomain',
+        'address.idnaddressencoder',
+    ])
 
     ->register('transport.sendmail')
     ->asNewInstanceOf('Swift_Transport_SendmailTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
         'transport.eventdispatcher',
-    ))
-
-    ->register('transport.mail')
-    ->asNewInstanceOf('Swift_Transport_MailTransport')
-    ->withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
+        'transport.localdomain',
+    ])
 
     ->register('transport.loadbalanced')
     ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
@@ -28,30 +33,40 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.spool')
     ->asNewInstanceOf('Swift_Transport_SpoolTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.null')
     ->asNewInstanceOf('Swift_Transport_NullTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
-
-    ->register('transport.mailinvoker')
-    ->asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.buffer')
     ->asNewInstanceOf('Swift_Transport_StreamBuffer')
-    ->withDependencies(array('transport.replacementfactory'))
+    ->withDependencies(['transport.replacementfactory'])
+
+    ->register('transport.smtphandlers')
+    ->asArray()
+    ->withDependencies(['transport.authhandler'])
 
     ->register('transport.authhandler')
     ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-    ->withDependencies(array(
-        array(
-            'transport.crammd5auth',
-            'transport.loginauth',
-            'transport.plainauth',
-            'transport.ntlmauth',
-            'transport.xoauth2auth',
-        ),
-    ))
+    ->withDependencies(['transport.authhandlers'])
+
+    ->register('transport.authhandlers')
+    ->asArray()
+    ->withDependencies([
+        'transport.crammd5auth',
+        'transport.loginauth',
+        'transport.plainauth',
+        'transport.ntlmauth',
+        'transport.xoauth2auth',
+    ])
+
+    ->register('transport.smtputf8handler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
+
+    ->register('transport.8bitmimehandler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
+    ->addConstructorValue('8BITMIME')
 
     ->register('transport.crammd5auth')
     ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
@@ -73,4 +88,10 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.replacementfactory')
     ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+
+    ->register('address.idnaddressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
+
+    ->register('address.utf8addressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
 ;
diff --git a/lib/swiftmailer/swiftmailer/lib/mime_types.php b/lib/swiftmailer/swiftmailer/lib/mime_types.php
index b42c1cc1a..72c6fd2af 100644
--- a/lib/swiftmailer/swiftmailer/lib/mime_types.php
+++ b/lib/swiftmailer/swiftmailer/lib/mime_types.php
@@ -17,7 +17,7 @@
 
 // You may add or take away what you like (lowercase required)
 
-$swift_mime_types = array(
+$swift_mime_types = [
     '3dml' => 'text/vnd.in3d.3dml',
     '3ds' => 'image/x-3ds',
     '3g2' => 'video/3gpp2',
@@ -1004,4 +1004,4 @@ $swift_mime_types = array(
     'zirz' => 'application/vnd.zul',
     'zmm' => 'application/vnd.handheld-entertainment+xml',
     '123' => 'application/vnd.lotus-1-2-3',
-);
+];
diff --git a/lib/swiftmailer/swiftmailer/lib/preferences.php b/lib/swiftmailer/swiftmailer/lib/preferences.php
index 0b430e67d..27b7065db 100644
--- a/lib/swiftmailer/swiftmailer/lib/preferences.php
+++ b/lib/swiftmailer/swiftmailer/lib/preferences.php
@@ -17,9 +17,3 @@ $preferences->setCharset('utf-8');
 if (@is_writable($tmpDir = sys_get_temp_dir())) {
     $preferences->setTempDir($tmpDir)->setCacheType('disk');
 }
-
-// this should only be done when Swiftmailer won't use the native QP content encoder
-// see mime_deps.php
-if (PHP_VERSION_ID < 50407) {
-    $preferences->setQPDotEscape(false);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/swift_init.php b/lib/swiftmailer/swiftmailer/lib/swift_init.php
deleted file mode 100644
index ff7196344..000000000
--- a/lib/swiftmailer/swiftmailer/lib/swift_init.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Dependency injection initialization for Swift Mailer.
- */
-
-if (defined('SWIFT_INIT_LOADED')) {
-    return;
-}
-
-define('SWIFT_INIT_LOADED', true);
-
-// Load in dependency maps
-require __DIR__.'/dependency_maps/cache_deps.php';
-require __DIR__.'/dependency_maps/mime_deps.php';
-require __DIR__.'/dependency_maps/message_deps.php';
-require __DIR__.'/dependency_maps/transport_deps.php';
-
-// Load in global library preferences
-require __DIR__.'/preferences.php';
diff --git a/lib/swiftmailer/swiftmailer/lib/swift_required.php b/lib/swiftmailer/swiftmailer/lib/swift_required.php
index 03a72ceae..d696056aa 100644
--- a/lib/swiftmailer/swiftmailer/lib/swift_required.php
+++ b/lib/swiftmailer/swiftmailer/lib/swift_required.php
@@ -8,23 +8,15 @@
  * file that was distributed with this source code.
  */
 
-/*
- * Autoloader and dependency injection initialization for Swift Mailer.
- */
-
-if (class_exists('Swift', false)) {
-    return;
-}
-
-// Load Swift utility class
 require __DIR__.'/classes/Swift.php';
 
-if (!function_exists('_swiftmailer_init')) {
-    function _swiftmailer_init()
-    {
-        require __DIR__.'/swift_init.php';
-    }
-}
+Swift::registerAutoload(function () {
+    // Load in dependency maps
+    require __DIR__.'/dependency_maps/cache_deps.php';
+    require __DIR__.'/dependency_maps/mime_deps.php';
+    require __DIR__.'/dependency_maps/message_deps.php';
+    require __DIR__.'/dependency_maps/transport_deps.php';
 
-// Start the autoloader and lazy-load the init script to set up dependency injection
-Swift::registerAutoload('_swiftmailer_init');
+    // Load in global library preferences
+    require __DIR__.'/preferences.php';
+});
diff --git a/lib/swiftmailer/swiftmailer/lib/swift_required_pear.php b/lib/swiftmailer/swiftmailer/lib/swift_required_pear.php
deleted file mode 100644
index 2b5181a93..000000000
--- a/lib/swiftmailer/swiftmailer/lib/swift_required_pear.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Autoloader and dependency injection initialization for Swift Mailer.
- */
-
-if (class_exists('Swift', false)) {
-    return;
-}
-
-// Load Swift utility class
-require __DIR__.'/Swift.php';
-
-if (!function_exists('_swiftmailer_init')) {
-    function _swiftmailer_init()
-    {
-        require __DIR__.'/swift_init.php';
-    }
-}
-
-// Start the autoloader and lazy-load the init script to set up dependency injection
-Swift::registerAutoload('_swiftmailer_init');
diff --git a/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
index 85f2d69f2..ad8fd2aa0 100644
--- a/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
+++ b/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -1,8 +1,8 @@
 #!/usr/bin/php
 
 <?php
-define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
-define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
+\define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
+\define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
 
 function generateUpToDateMimeArray()
 {
@@ -25,12 +25,12 @@ function generateUpToDateMimeArray()
     $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
 
     // prepare valid mime types
-    $valid_mime_types = array();
+    $valid_mime_types = [];
 
     // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
-    if (preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches) !== false) {
+    if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
         // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
-        $valid_mime_types_preset = array(
+        $valid_mime_types_preset = [
             'php' => 'application/x-php',
             'php3' => 'application/x-php',
             'php4' => 'application/x-php',
@@ -95,7 +95,7 @@ function generateUpToDateMimeArray()
             'xls' => 'application/vnd.ms-excel',
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
             'xml' => 'application/xml',
-        );
+        ];
 
         // wrap array for generating file
         foreach ($valid_mime_types_preset as $extension => $mime_type) {
@@ -103,17 +103,14 @@ function generateUpToDateMimeArray()
             $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
         }
 
-        // collect extensions
-        $valid_extensions = array();
-
         // all extensions from second match
         foreach ($matches[2] as $i => $extensions) {
             // explode multiple extensions from string
-            $extensions = explode(' ', strtolower($extensions));
+            $extensions = explode(' ', strtolower($extensions ?? ''));
 
             // force array for foreach
-            if (!is_array($extensions)) {
-                $extensions = array($extensions);
+            if (!\is_array($extensions)) {
+                $extensions = [$extensions];
             }
 
             foreach ($extensions as $extension) {
@@ -121,10 +118,7 @@ function generateUpToDateMimeArray()
                 $mime_type = $matches[1][$i];
 
                 // check if string length lower than 10
-                if (strlen($extension) < 10) {
-                    // add extension
-                    $valid_extensions[] = $extension;
-
+                if (\strlen($extension) < 10) {
                     if (!isset($valid_mime_types[$mime_type])) {
                         // generate array for mimetype to extension resolver (only first match)
                         $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
@@ -145,29 +139,24 @@ function generateUpToDateMimeArray()
         // get all matching extensions from match
         foreach ((array) $node->glob['pattern'] as $extension) {
             // skip none glob extensions
-            if (strpos($extension, '.') === false) {
+            if (false === strpos($extension ?? '', '.')) {
                 continue;
             }
 
             // remove get only last part
-            $extension = explode('.', strtolower($extension));
+            $extension = explode('.', strtolower($extension ?? ''));
             $extension = end($extension);
-
-            // maximum length in database column
-            if (strlen($extension) <= 9) {
-                $valid_extensions[] = $extension;
-            }
         }
 
         if (isset($node->glob['pattern'][0])) {
             // mime type
-            $mime_type = strtolower((string) $node['type']);
+            $mime_type = strtolower((string) $node['type'] ?? '');
 
             // get first extension
-            $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
+            $extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
 
             // skip none glob extensions and check if string length between 1 and 10
-            if (strpos($extension, '.') !== false || strlen($extension) < 1 || strlen($extension) > 9) {
+            if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
                 continue;
             }
 
@@ -184,7 +173,7 @@ function generateUpToDateMimeArray()
     ksort($valid_mime_types);
 
     // combine mime types and extensions array
-    $output = "$preamble\$swift_mime_types = array(\n    ".implode($valid_mime_types, ",\n    ")."\n);";
+    $output = "$preamble\$swift_mime_types = array(\n    ".implode(",\n    ", $valid_mime_types)."\n);";
 
     // write mime_types.php config file
     @file_put_contents('./mime_types.php', $output);
diff --git a/lib/swiftmailer/swiftmailer/phpunit.xml.dist b/lib/swiftmailer/swiftmailer/phpunit.xml.dist
deleted file mode 100644
index 606c5b449..000000000
--- a/lib/swiftmailer/swiftmailer/phpunit.xml.dist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
->
-    <php>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="SwiftMailer unit tests">
-            <directory>tests/unit</directory>
-        </testsuite>
-        <testsuite name="SwiftMailer acceptance tests">
-            <directory>tests/acceptance</directory>
-        </testsuite>
-        <testsuite name="SwiftMailer bug">
-            <directory>tests/bug</directory>
-        </testsuite>
-        <testsuite name="SwiftMailer smoke tests">
-            <directory>tests/smoke</directory>
-        </testsuite>
-    </testsuites>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-        <listener class="Mockery\Adapter\Phpunit\TestListener" />
-    </listeners>
-</phpunit>
diff --git a/lib/symfony/polyfill-iconv/Iconv.php b/lib/symfony/polyfill-iconv/Iconv.php
new file mode 100644
index 000000000..180b5bfff
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/Iconv.php
@@ -0,0 +1,745 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Iconv;
+
+/**
+ * iconv implementation in pure PHP, UTF-8 centric.
+ *
+ * Implemented:
+ * - iconv              - Convert string to requested character encoding
+ * - iconv_mime_decode  - Decodes a MIME header field
+ * - iconv_mime_decode_headers - Decodes multiple MIME header fields at once
+ * - iconv_get_encoding - Retrieve internal configuration variables of iconv extension
+ * - iconv_set_encoding - Set current setting for character encoding conversion
+ * - iconv_mime_encode  - Composes a MIME header field
+ * - iconv_strlen       - Returns the character count of string
+ * - iconv_strpos       - Finds position of first occurrence of a needle within a haystack
+ * - iconv_strrpos      - Finds the last occurrence of a needle within a haystack
+ * - iconv_substr       - Cut out part of a string
+ *
+ * Charsets available for conversion are defined by files
+ * in the charset/ directory and by Iconv::$alias below.
+ * You're welcome to send back any addition you make.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class Iconv
+{
+    const ERROR_ILLEGAL_CHARACTER = 'iconv(): Detected an illegal character in input string';
+    const ERROR_WRONG_CHARSET = 'iconv(): Wrong charset, conversion from `%s\' to `%s\' is not allowed';
+
+    public static $inputEncoding = 'utf-8';
+    public static $outputEncoding = 'utf-8';
+    public static $internalEncoding = 'utf-8';
+
+    private static $alias = array(
+        'utf8' => 'utf-8',
+        'ascii' => 'us-ascii',
+        'tis-620' => 'iso-8859-11',
+        'cp1250' => 'windows-1250',
+        'cp1251' => 'windows-1251',
+        'cp1252' => 'windows-1252',
+        'cp1253' => 'windows-1253',
+        'cp1254' => 'windows-1254',
+        'cp1255' => 'windows-1255',
+        'cp1256' => 'windows-1256',
+        'cp1257' => 'windows-1257',
+        'cp1258' => 'windows-1258',
+        'shift-jis' => 'cp932',
+        'shift_jis' => 'cp932',
+        'latin1' => 'iso-8859-1',
+        'latin2' => 'iso-8859-2',
+        'latin3' => 'iso-8859-3',
+        'latin4' => 'iso-8859-4',
+        'latin5' => 'iso-8859-9',
+        'latin6' => 'iso-8859-10',
+        'latin7' => 'iso-8859-13',
+        'latin8' => 'iso-8859-14',
+        'latin9' => 'iso-8859-15',
+        'latin10' => 'iso-8859-16',
+        'iso8859-1' => 'iso-8859-1',
+        'iso8859-2' => 'iso-8859-2',
+        'iso8859-3' => 'iso-8859-3',
+        'iso8859-4' => 'iso-8859-4',
+        'iso8859-5' => 'iso-8859-5',
+        'iso8859-6' => 'iso-8859-6',
+        'iso8859-7' => 'iso-8859-7',
+        'iso8859-8' => 'iso-8859-8',
+        'iso8859-9' => 'iso-8859-9',
+        'iso8859-10' => 'iso-8859-10',
+        'iso8859-11' => 'iso-8859-11',
+        'iso8859-12' => 'iso-8859-12',
+        'iso8859-13' => 'iso-8859-13',
+        'iso8859-14' => 'iso-8859-14',
+        'iso8859-15' => 'iso-8859-15',
+        'iso8859-16' => 'iso-8859-16',
+        'iso_8859-1' => 'iso-8859-1',
+        'iso_8859-2' => 'iso-8859-2',
+        'iso_8859-3' => 'iso-8859-3',
+        'iso_8859-4' => 'iso-8859-4',
+        'iso_8859-5' => 'iso-8859-5',
+        'iso_8859-6' => 'iso-8859-6',
+        'iso_8859-7' => 'iso-8859-7',
+        'iso_8859-8' => 'iso-8859-8',
+        'iso_8859-9' => 'iso-8859-9',
+        'iso_8859-10' => 'iso-8859-10',
+        'iso_8859-11' => 'iso-8859-11',
+        'iso_8859-12' => 'iso-8859-12',
+        'iso_8859-13' => 'iso-8859-13',
+        'iso_8859-14' => 'iso-8859-14',
+        'iso_8859-15' => 'iso-8859-15',
+        'iso_8859-16' => 'iso-8859-16',
+        'iso88591' => 'iso-8859-1',
+        'iso88592' => 'iso-8859-2',
+        'iso88593' => 'iso-8859-3',
+        'iso88594' => 'iso-8859-4',
+        'iso88595' => 'iso-8859-5',
+        'iso88596' => 'iso-8859-6',
+        'iso88597' => 'iso-8859-7',
+        'iso88598' => 'iso-8859-8',
+        'iso88599' => 'iso-8859-9',
+        'iso885910' => 'iso-8859-10',
+        'iso885911' => 'iso-8859-11',
+        'iso885912' => 'iso-8859-12',
+        'iso885913' => 'iso-8859-13',
+        'iso885914' => 'iso-8859-14',
+        'iso885915' => 'iso-8859-15',
+        'iso885916' => 'iso-8859-16',
+    );
+    private static $translitMap = array();
+    private static $convertMap = array();
+    private static $errorHandler;
+    private static $lastError;
+
+    private static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
+    private static $isValidUtf8;
+
+    public static function iconv($inCharset, $outCharset, $str)
+    {
+        $str = (string) $str;
+        if ('' === $str) {
+            return '';
+        }
+
+        // Prepare for //IGNORE and //TRANSLIT
+
+        $translit = $ignore = '';
+
+        $outCharset = strtolower($outCharset);
+        $inCharset = strtolower($inCharset);
+
+        if ('' === $outCharset) {
+            $outCharset = 'iso-8859-1';
+        }
+        if ('' === $inCharset) {
+            $inCharset = 'iso-8859-1';
+        }
+
+        do {
+            $loop = false;
+
+            if ('//translit' === substr($outCharset, -10)) {
+                $loop = $translit = true;
+                $outCharset = substr($outCharset, 0, -10);
+            }
+
+            if ('//ignore' === substr($outCharset, -8)) {
+                $loop = $ignore = true;
+                $outCharset = substr($outCharset, 0, -8);
+            }
+        } while ($loop);
+
+        do {
+            $loop = false;
+
+            if ('//translit' === substr($inCharset, -10)) {
+                $loop = true;
+                $inCharset = substr($inCharset, 0, -10);
+            }
+
+            if ('//ignore' === substr($inCharset, -8)) {
+                $loop = true;
+                $inCharset = substr($inCharset, 0, -8);
+            }
+        } while ($loop);
+
+        if (isset(self::$alias[$inCharset])) {
+            $inCharset = self::$alias[$inCharset];
+        }
+        if (isset(self::$alias[$outCharset])) {
+            $outCharset = self::$alias[$outCharset];
+        }
+
+        // Load charset maps
+
+        if (('utf-8' !== $inCharset && !self::loadMap('from.', $inCharset, $inMap))
+          || ('utf-8' !== $outCharset && !self::loadMap('to.', $outCharset, $outMap))) {
+            trigger_error(sprintf(self::ERROR_WRONG_CHARSET, $inCharset, $outCharset));
+
+            return false;
+        }
+
+        if ('utf-8' !== $inCharset) {
+            // Convert input to UTF-8
+            $result = '';
+            if (self::mapToUtf8($result, $inMap, $str, $ignore)) {
+                $str = $result;
+            } else {
+                $str = false;
+            }
+            self::$isValidUtf8 = true;
+        } else {
+            self::$isValidUtf8 = preg_match('//u', $str);
+
+            if (!self::$isValidUtf8 && !$ignore) {
+                trigger_error(self::ERROR_ILLEGAL_CHARACTER);
+
+                return false;
+            }
+
+            if ('utf-8' === $outCharset) {
+                // UTF-8 validation
+                $str = self::utf8ToUtf8($str, $ignore);
+            }
+        }
+
+        if ('utf-8' !== $outCharset && false !== $str) {
+            // Convert output to UTF-8
+            $result = '';
+            if (self::mapFromUtf8($result, $outMap, $str, $ignore, $translit)) {
+                return $result;
+            }
+
+            return false;
+        }
+
+        return $str;
+    }
+
+    public static function iconv_mime_decode_headers($str, $mode = 0, $charset = null)
+    {
+        if (null === $charset) {
+            $charset = self::$internalEncoding;
+        }
+
+        if (false !== strpos($str, "\r")) {
+            $str = strtr(str_replace("\r\n", "\n", $str), "\r", "\n");
+        }
+        $str = explode("\n\n", $str, 2);
+
+        $headers = array();
+
+        $str = preg_split('/\n(?![ \t])/', $str[0]);
+        foreach ($str as $str) {
+            $str = self::iconv_mime_decode($str, $mode, $charset);
+            if (false === $str) {
+                return false;
+            }
+            $str = explode(':', $str, 2);
+
+            if (2 === \count($str)) {
+                if (isset($headers[$str[0]])) {
+                    if (!\is_array($headers[$str[0]])) {
+                        $headers[$str[0]] = array($headers[$str[0]]);
+                    }
+                    $headers[$str[0]][] = ltrim($str[1]);
+                } else {
+                    $headers[$str[0]] = ltrim($str[1]);
+                }
+            }
+        }
+
+        return $headers;
+    }
+
+    public static function iconv_mime_decode($str, $mode = 0, $charset = null)
+    {
+        if (null === $charset) {
+            $charset = self::$internalEncoding;
+        }
+        if (ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode) {
+            $charset .= '//IGNORE';
+        }
+
+        if (false !== strpos($str, "\r")) {
+            $str = strtr(str_replace("\r\n", "\n", $str), "\r", "\n");
+        }
+        $str = preg_split('/\n(?![ \t])/', rtrim($str), 2);
+        $str = preg_replace('/[ \t]*\n[ \t]+/', ' ', rtrim($str[0]));
+        $str = preg_split('/=\?([^?]+)\?([bqBQ])\?(.*?)\?=/', $str, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $result = self::iconv('utf-8', $charset, $str[0]);
+        if (false === $result) {
+            return false;
+        }
+
+        $i = 1;
+        $len = \count($str);
+
+        while ($i < $len) {
+            $c = strtolower($str[$i]);
+            if ((ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode)
+              && 'utf-8' !== $c
+              && !isset(self::$alias[$c])
+              && !self::loadMap('from.', $c, $d)) {
+                $d = false;
+            } elseif ('B' === strtoupper($str[$i + 1])) {
+                $d = base64_decode($str[$i + 2]);
+            } else {
+                $d = rawurldecode(strtr(str_replace('%', '%25', $str[$i + 2]), '=_', '% '));
+            }
+
+            if (false !== $d) {
+                if ('' !== $d) {
+                    if ('' === $d = self::iconv($c, $charset, $d)) {
+                        $str[$i + 3] = substr($str[$i + 3], 1);
+                    } else {
+                        $result .= $d;
+                    }
+                }
+                $d = self::iconv('utf-8', $charset, $str[$i + 3]);
+                if ('' !== trim($d)) {
+                    $result .= $d;
+                }
+            } elseif (ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode) {
+                $result .= "=?{$str[$i]}?{$str[$i + 1]}?{$str[$i + 2]}?={$str[$i + 3]}";
+            } else {
+                $result = false;
+                break;
+            }
+
+            $i += 4;
+        }
+
+        return $result;
+    }
+
+    public static function iconv_get_encoding($type = 'all')
+    {
+        switch ($type) {
+            case 'input_encoding': return self::$inputEncoding;
+            case 'output_encoding': return self::$outputEncoding;
+            case 'internal_encoding': return self::$internalEncoding;
+        }
+
+        return array(
+            'input_encoding' => self::$inputEncoding,
+            'output_encoding' => self::$outputEncoding,
+            'internal_encoding' => self::$internalEncoding,
+        );
+    }
+
+    public static function iconv_set_encoding($type, $charset)
+    {
+        switch ($type) {
+            case 'input_encoding': self::$inputEncoding = $charset; break;
+            case 'output_encoding': self::$outputEncoding = $charset; break;
+            case 'internal_encoding': self::$internalEncoding = $charset; break;
+
+            default: return false;
+        }
+
+        return true;
+    }
+
+    public static function iconv_mime_encode($fieldName, $fieldValue, $pref = null)
+    {
+        if (!\is_array($pref)) {
+            $pref = array();
+        }
+
+        $pref += array(
+            'scheme' => 'B',
+            'input-charset' => self::$internalEncoding,
+            'output-charset' => self::$internalEncoding,
+            'line-length' => 76,
+            'line-break-chars' => "\r\n",
+        );
+
+        if (preg_match('/[\x80-\xFF]/', $fieldName)) {
+            $fieldName = '';
+        }
+
+        $scheme = strtoupper(substr($pref['scheme'], 0, 1));
+        $in = strtolower($pref['input-charset']);
+        $out = strtolower($pref['output-charset']);
+
+        if ('utf-8' !== $in && false === $fieldValue = self::iconv($in, 'utf-8', $fieldValue)) {
+            return false;
+        }
+
+        preg_match_all('/./us', $fieldValue, $chars);
+
+        $chars = isset($chars[0]) ? $chars[0] : array();
+
+        $lineBreak = (int) $pref['line-length'];
+        $lineStart = "=?{$pref['output-charset']}?{$scheme}?";
+        $lineLength = \strlen($fieldName) + 2 + \strlen($lineStart) + 2;
+        $lineOffset = \strlen($lineStart) + 3;
+        $lineData = '';
+
+        $fieldValue = array();
+
+        $Q = 'Q' === $scheme;
+
+        foreach ($chars as $c) {
+            if ('utf-8' !== $out && false === $c = self::iconv('utf-8', $out, $c)) {
+                return false;
+            }
+
+            $o = $Q
+                ? $c = preg_replace_callback(
+                    '/[=_\?\x00-\x1F\x80-\xFF]/',
+                    array(__CLASS__, 'qpByteCallback'),
+                    $c
+                )
+                : base64_encode($lineData.$c);
+
+            if (isset($o[$lineBreak - $lineLength])) {
+                if (!$Q) {
+                    $lineData = base64_encode($lineData);
+                }
+                $fieldValue[] = $lineStart.$lineData.'?=';
+                $lineLength = $lineOffset;
+                $lineData = '';
+            }
+
+            $lineData .= $c;
+            $Q && $lineLength += \strlen($c);
+        }
+
+        if ('' !== $lineData) {
+            if (!$Q) {
+                $lineData = base64_encode($lineData);
+            }
+            $fieldValue[] = $lineStart.$lineData.'?=';
+        }
+
+        return $fieldName.': '.implode($pref['line-break-chars'].' ', $fieldValue);
+    }
+
+    public static function iconv_strlen($s, $encoding = null)
+    {
+        static $hasXml = null;
+        if (null === $hasXml) {
+            $hasXml = \extension_loaded('xml');
+        }
+
+        if ($hasXml) {
+            return self::strlen1($s, $encoding);
+        }
+
+        return self::strlen2($s, $encoding);
+    }
+
+    public static function strlen1($s, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+        if (0 !== stripos($encoding, 'utf-8') && false === $s = self::iconv($encoding, 'utf-8', $s)) {
+            return false;
+        }
+
+        return \strlen(utf8_decode($s));
+    }
+
+    public static function strlen2($s, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+        if (0 !== stripos($encoding, 'utf-8') && false === $s = self::iconv($encoding, 'utf-8', $s)) {
+            return false;
+        }
+
+        $ulenMask = self::$ulenMask;
+
+        $i = 0;
+        $j = 0;
+        $len = \strlen($s);
+
+        while ($i < $len) {
+            $u = $s[$i] & "\xF0";
+            $i += isset($ulenMask[$u]) ? $ulenMask[$u] : 1;
+            ++$j;
+        }
+
+        return $j;
+    }
+
+    public static function iconv_strpos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+
+        if (0 !== stripos($encoding, 'utf-8')) {
+            if (false === $haystack = self::iconv($encoding, 'utf-8', $haystack)) {
+                return false;
+            }
+            if (false === $needle = self::iconv($encoding, 'utf-8', $needle)) {
+                return false;
+            }
+        }
+
+        if ($offset = (int) $offset) {
+            $haystack = self::iconv_substr($haystack, $offset, 2147483647, 'utf-8');
+        }
+        $pos = strpos($haystack, $needle);
+
+        return false === $pos ? false : ($offset + ($pos ? self::iconv_strlen(substr($haystack, 0, $pos), 'utf-8') : 0));
+    }
+
+    public static function iconv_strrpos($haystack, $needle, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+
+        if (0 !== stripos($encoding, 'utf-8')) {
+            if (false === $haystack = self::iconv($encoding, 'utf-8', $haystack)) {
+                return false;
+            }
+            if (false === $needle = self::iconv($encoding, 'utf-8', $needle)) {
+                return false;
+            }
+        }
+
+        $pos = isset($needle[0]) ? strrpos($haystack, $needle) : false;
+
+        return false === $pos ? false : self::iconv_strlen($pos ? substr($haystack, 0, $pos) : $haystack, 'utf-8');
+    }
+
+    public static function iconv_substr($s, $start, $length = 2147483647, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+        if (0 !== stripos($encoding, 'utf-8')) {
+            $encoding = null;
+        } elseif (false === $s = self::iconv($encoding, 'utf-8', $s)) {
+            return false;
+        }
+
+        $s = (string) $s;
+        $slen = self::iconv_strlen($s, 'utf-8');
+        $start = (int) $start;
+
+        if (0 > $start) {
+            $start += $slen;
+        }
+        if (0 > $start) {
+            if (\PHP_VERSION_ID < 80000) {
+                return false;
+            }
+
+            $start = 0;
+        }
+        if ($start >= $slen) {
+            return \PHP_VERSION_ID >= 80000 ? '' : false;
+        }
+
+        $rx = $slen - $start;
+
+        if (0 > $length) {
+            $length += $rx;
+        }
+        if (0 === $length) {
+            return '';
+        }
+        if (0 > $length) {
+            return \PHP_VERSION_ID >= 80000 ? '' : false;
+        }
+
+        if ($length > $rx) {
+            $length = $rx;
+        }
+
+        $rx = '/^'.($start ? self::pregOffset($start) : '').'('.self::pregOffset($length).')/u';
+
+        $s = preg_match($rx, $s, $s) ? $s[1] : '';
+
+        if (null === $encoding) {
+            return $s;
+        }
+
+        return self::iconv('utf-8', $encoding, $s);
+    }
+
+    private static function loadMap($type, $charset, &$map)
+    {
+        if (!isset(self::$convertMap[$type.$charset])) {
+            if (false === $map = self::getData($type.$charset)) {
+                if ('to.' === $type && self::loadMap('from.', $charset, $map)) {
+                    $map = array_flip($map);
+                } else {
+                    return false;
+                }
+            }
+
+            self::$convertMap[$type.$charset] = $map;
+        } else {
+            $map = self::$convertMap[$type.$charset];
+        }
+
+        return true;
+    }
+
+    private static function utf8ToUtf8($str, $ignore)
+    {
+        $ulenMask = self::$ulenMask;
+        $valid = self::$isValidUtf8;
+
+        $u = $str;
+        $i = $j = 0;
+        $len = \strlen($str);
+
+        while ($i < $len) {
+            if ($str[$i] < "\x80") {
+                $u[$j++] = $str[$i++];
+            } else {
+                $ulen = $str[$i] & "\xF0";
+                $ulen = isset($ulenMask[$ulen]) ? $ulenMask[$ulen] : 1;
+                $uchr = substr($str, $i, $ulen);
+
+                if (1 === $ulen || !($valid || preg_match('/^.$/us', $uchr))) {
+                    if ($ignore) {
+                        ++$i;
+                        continue;
+                    }
+
+                    trigger_error(self::ERROR_ILLEGAL_CHARACTER);
+
+                    return false;
+                } else {
+                    $i += $ulen;
+                }
+
+                $u[$j++] = $uchr[0];
+
+                isset($uchr[1]) && 0 !== ($u[$j++] = $uchr[1])
+                    && isset($uchr[2]) && 0 !== ($u[$j++] = $uchr[2])
+                    && isset($uchr[3]) && 0 !== ($u[$j++] = $uchr[3]);
+            }
+        }
+
+        return substr($u, 0, $j);
+    }
+
+    private static function mapToUtf8(&$result, array $map, $str, $ignore)
+    {
+        $len = \strlen($str);
+        for ($i = 0; $i < $len; ++$i) {
+            if (isset($str[$i + 1], $map[$str[$i].$str[$i + 1]])) {
+                $result .= $map[$str[$i].$str[++$i]];
+            } elseif (isset($map[$str[$i]])) {
+                $result .= $map[$str[$i]];
+            } elseif (!$ignore) {
+                trigger_error(self::ERROR_ILLEGAL_CHARACTER);
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static function mapFromUtf8(&$result, array $map, $str, $ignore, $translit)
+    {
+        $ulenMask = self::$ulenMask;
+        $valid = self::$isValidUtf8;
+
+        if ($translit && !self::$translitMap) {
+            self::$translitMap = self::getData('translit');
+        }
+
+        $i = 0;
+        $len = \strlen($str);
+
+        while ($i < $len) {
+            if ($str[$i] < "\x80") {
+                $uchr = $str[$i++];
+            } else {
+                $ulen = $str[$i] & "\xF0";
+                $ulen = isset($ulenMask[$ulen]) ? $ulenMask[$ulen] : 1;
+                $uchr = substr($str, $i, $ulen);
+
+                if ($ignore && (1 === $ulen || !($valid || preg_match('/^.$/us', $uchr)))) {
+                    ++$i;
+                    continue;
+                } else {
+                    $i += $ulen;
+                }
+            }
+
+            if (isset($map[$uchr])) {
+                $result .= $map[$uchr];
+            } elseif ($translit) {
+                if (isset(self::$translitMap[$uchr])) {
+                    $uchr = self::$translitMap[$uchr];
+                } elseif ($uchr >= "\xC3\x80") {
+                    $uchr = \Normalizer::normalize($uchr, \Normalizer::NFD);
+
+                    if ($uchr[0] < "\x80") {
+                        $uchr = $uchr[0];
+                    } elseif ($ignore) {
+                        continue;
+                    } else {
+                        return false;
+                    }
+                } elseif ($ignore) {
+                    continue;
+                } else {
+                    return false;
+                }
+
+                $str = $uchr.substr($str, $i);
+                $len = \strlen($str);
+                $i = 0;
+            } elseif (!$ignore) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static function qpByteCallback(array $m)
+    {
+        return '='.strtoupper(dechex(\ord($m[0])));
+    }
+
+    private static function pregOffset($offset)
+    {
+        $rx = array();
+        $offset = (int) $offset;
+
+        while ($offset > 65535) {
+            $rx[] = '.{65535}';
+            $offset -= 65535;
+        }
+
+        return implode('', $rx).'.{'.$offset.'}';
+    }
+
+    private static function getData($file)
+    {
+        if (file_exists($file = __DIR__.'/Resources/charset/'.$file.'.php')) {
+            return require $file;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/symfony/polyfill-iconv/LICENSE b/lib/symfony/polyfill-iconv/LICENSE
new file mode 100644
index 000000000..4cd8bdd30
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-iconv/README.md b/lib/symfony/polyfill-iconv/README.md
new file mode 100644
index 000000000..b0c8984cd
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/README.md
@@ -0,0 +1,14 @@
+Symfony Polyfill / Iconv
+========================
+
+This component provides a native PHP implementation of the
+[php.net/iconv](https://php.net/iconv) functions
+(short of [`ob_iconv_handler`](https://php.net/ob-iconv-handler)).
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.big5.php b/lib/symfony/polyfill-iconv/Resources/charset/from.big5.php
new file mode 100644
index 000000000..b11985494
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/Resources/charset/from.big5.php
@@ -0,0 +1,13719 @@
+<?php
+
+static $data = array (
+  '�@' => '　',
+  '�A' => '，',
+  '�B' => '、',
+  '�C' => '。',
+  '�D' => '．',
+  '�E' => '•',
+  '�F' => '；',
+  '�G' => '：',
+  '�H' => '？',
+  '�I' => '！',
+  '�J' => '︰',
+  '�K' => '…',
+  '�L' => '‥',
+  '�M' => '﹐',
+  '�N' => '､',
+  '�O' => '﹒',
+  '�P' => '·',
+  '�Q' => '﹔',
+  '�R' => '﹕',
+  '�S' => '﹖',
+  '�T' => '﹗',
+  '�U' => '｜',
+  '�V' => '–',
+  '�W' => '︱',
+  '�X' => '—',
+  '�Y' => '︳',
+  '�Z' => '�',
+  '�[' => '︴',
+  '�\\' => '﹏',
+  '�]' => '（',
+  '�^' => '）',
+  '�_' => '︵',
+  '�`' => '︶',
+  '�a' => '｛',
+  '�b' => '｝',
+  '�c' => '︷',
+  '�d' => '︸',
+  '�e' => '〔',
+  '�f' => '〕',
+  '�g' => '︹',
+  '�h' => '︺',
+  '�i' => '【',
+  '�j' => '】',
+  '�k' => '︻',
+  '�l' => '︼',
+  '�m' => '《',
+  '�n' => '》',
+  '�o' => '︽',
+  '�p' => '︾',
+  '�q' => '〈',
+  '�r' => '〉',
+  '�s' => '︿',
+  '�t' => '﹀',
+  '�u' => '「',
+  '�v' => '」',
+  '�w' => '﹁',
+  '�x' => '﹂',
+  '�y' => '『',
+  '�z' => '』',
+  '�{' => '﹃',
+  '�|' => '﹄',
+  '�}' => '﹙',
+  '�~' => '﹚',
+  '��' => '﹛',
+  '��' => '﹜',
+  '��' => '﹝',
+  '��' => '﹞',
+  '��' => '‘',
+  '��' => '’',
+  '��' => '“',
+  '��' => '”',
+  '��' => '〝',
+  '��' => '〞',
+  '��' => '‵',
+  '��' => '′',
+  '��' => '＃',
+  '��' => '＆',
+  '��' => '＊',
+  '��' => '※',
+  '��' => '§',
+  '��' => '〃',
+  '��' => '○',
+  '��' => '●',
+  '��' => '△',
+  '��' => '▲',
+  '��' => '◎',
+  '��' => '☆',
+  '��' => '★',
+  '��' => '◇',
+  '��' => '◆',
+  '��' => '□',
+  '��' => '■',
+  '��' => '▽',
+  '��' => '▼',
+  '��' => '㊣',
+  '��' => '℅',
+  '��' => '‾',
+  '��' => '�',
+  '��' => '＿',
+  '��' => '�',
+  '��' => '﹉',
+  '��' => '﹊',
+  '��' => '﹍',
+  '��' => '﹎',
+  '��' => '﹋',
+  '��' => '﹌',
+  '��' => '﹟',
+  '��' => '﹠',
+  '��' => '﹡',
+  '��' => '＋',
+  '��' => '－',
+  '��' => '×',
+  '��' => '÷',
+  '��' => '±',
+  '��' => '√',
+  '��' => '＜',
+  '��' => '＞',
+  '��' => '＝',
+  '��' => '≦',
+  '��' => '≧',
+  '��' => '≠',
+  '��' => '∞',
+  '��' => '≒',
+  '��' => '≡',
+  '��' => '﹢',
+  '��' => '﹣',
+  '��' => '﹤',
+  '��' => '﹥',
+  '��' => '﹦',
+  '��' => '∼',
+  '��' => '∩',
+  '��' => '∪',
+  '��' => '⊥',
+  '��' => '∠',
+  '��' => '∟',
+  '��' => '⊿',
+  '��' => '㏒',
+  '��' => '㏑',
+  '��' => '∫',
+  '��' => '∮',
+  '��' => '∵',
+  '��' => '∴',
+  '��' => '♀',
+  '��' => '♂',
+  '��' => '♁',
+  '��' => '☉',
+  '��' => '↑',
+  '��' => '↓',
+  '��' => '←',
+  '��' => '→',
+  '��' => '↖',
+  '��' => '↗',
+  '��' => '↙',
+  '��' => '↘',
+  '��' => '∥',
+  '��' => '∣',
+  '��' => '�',
+  '�@' => '�',
+  '�A' => '／',
+  '�B' => '＼',
+  '�C' => '＄',
+  '�D' => '¥',
+  '�E' => '〒',
+  '�F' => '¢',
+  '�G' => '£',
+  '�H' => '％',
+  '�I' => '＠',
+  '�J' => '℃',
+  '�K' => '℉',
+  '�L' => '﹩',
+  '�M' => '﹪',
+  '�N' => '﹫',
+  '�O' => '㏕',
+  '�P' => '㎜',
+  '�Q' => '㎝',
+  '�R' => '㎞',
+  '�S' => '㏎',
+  '�T' => '㎡',
+  '�U' => '㎎',
+  '�V' => '㎏',
+  '�W' => '㏄',
+  '�X' => '°',
+  '�Y' => '兙',
+  '�Z' => '兛',
+  '�[' => '兞',
+  '�\\' => '兝',
+  '�]' => '兡',
+  '�^' => '兣',
+  '�_' => '嗧',
+  '�`' => '瓩',
+  '�a' => '糎',
+  '�b' => '▁',
+  '�c' => '▂',
+  '�d' => '▃',
+  '�e' => '▄',
+  '�f' => '▅',
+  '�g' => '▆',
+  '�h' => '▇',
+  '�i' => '█',
+  '�j' => '▏',
+  '�k' => '▎',
+  '�l' => '▍',
+  '�m' => '▌',
+  '�n' => '▋',
+  '�o' => '▊',
+  '�p' => '▉',
+  '�q' => '┼',
+  '�r' => '┴',
+  '�s' => '┬',
+  '�t' => '┤',
+  '�u' => '├',
+  '�v' => '▔',
+  '�w' => '─',
+  '�x' => '│',
+  '�y' => '▕',
+  '�z' => '┌',
+  '�{' => '┐',
+  '�|' => '└',
+  '�}' => '┘',
+  '�~' => '╭',
+  '��' => '╮',
+  '��' => '╰',
+  '��' => '╯',
+  '��' => '═',
+  '��' => '╞',
+  '��' => '╪',
+  '��' => '╡',
+  '��' => '◢',
+  '��' => '◣',
+  '��' => '◥',
+  '��' => '◤',
+  '��' => '╱',
+  '��' => '╲',
+  '��' => '╳',
+  '��' => '０',
+  '��' => '１',
+  '��' => '２',
+  '��' => '３',
+  '��' => '４',
+  '��' => '５',
+  '��' => '６',
+  '��' => '７',
+  '��' => '８',
+  '��' => '９',
+  '��' => 'Ⅰ',
+  '��' => 'Ⅱ',
+  '��' => 'Ⅲ',
+  '��' => 'Ⅳ',
+  '��' => 'Ⅴ',
+  '��' => 'Ⅵ',
+  '��' => 'Ⅶ',
+  '��' => 'Ⅷ',
+  '��' => 'Ⅸ',
+  '��' => 'Ⅹ',
+  '��' => '〡',
+  '��' => '〢',
+  '��' => '〣',
+  '��' => '〤',
+  '��' => '〥',
+  '��' => '〦',
+  '��' => '〧',
+  '��' => '〨',
+  '��' => '〩',
+  '��' => '�',
+  '��' => '卄',
+  '��' => '�',
+  '��' => 'Ａ',
+  '��' => 'Ｂ',
+  '��' => 'Ｃ',
+  '��' => 'Ｄ',
+  '��' => 'Ｅ',
+  '��' => 'Ｆ',
+  '��' => 'Ｇ',
+  '��' => 'Ｈ',
+  '��' => 'Ｉ',
+  '��' => 'Ｊ',
+  '��' => 'Ｋ',
+  '��' => 'Ｌ',
+  '��' => 'Ｍ',
+  '��' => 'Ｎ',
+  '��' => 'Ｏ',
+  '��' => 'Ｐ',
+  '��' => 'Ｑ',
+  '��' => 'Ｒ',
+  '��' => 'Ｓ',
+  '��' => 'Ｔ',
+  '��' => 'Ｕ',
+  '��' => 'Ｖ',
+  '��' => 'Ｗ',
+  '��' => 'Ｘ',
+  '��' => 'Ｙ',
+  '��' => 'Ｚ',
+  '��' => 'ａ',
+  '��' => 'ｂ',
+  '��' => 'ｃ',
+  '��' => 'ｄ',
+  '��' => 'ｅ',
+  '��' => 'ｆ',
+  '��' => 'ｇ',
+  '��' => 'ｈ',
+  '��' => 'ｉ',
+  '��' => 'ｊ',
+  '��' => 'ｋ',
+  '��' => 'ｌ',
+  '��' => 'ｍ',
+  '��' => 'ｎ',
+  '��' => 'ｏ',
+  '��' => 'ｐ',
+  '��' => 'ｑ',
+  '��' => 'ｒ',
+  '��' => 'ｓ',
+  '��' => 'ｔ',
+  '��' => 'ｕ',
+  '��' => 'ｖ',
+  '�@' => 'ｗ',
+  '�A' => 'ｘ',
+  '�B' => 'ｙ',
+  '�C' => 'ｚ',
+  '�D' => 'Α',
+  '�E' => 'Β',
+  '�F' => 'Γ',
+  '�G' => 'Δ',
+  '�H' => 'Ε',
+  '�I' => 'Ζ',
+  '�J' => 'Η',
+  '�K' => 'Θ',
+  '�L' => 'Ι',
+  '�M' => 'Κ',
+  '�N' => 'Λ',
+  '�O' => 'Μ',
+  '�P' => 'Ν',
+  '�Q' => 'Ξ',
+  '�R' => 'Ο',
+  '�S' => 'Π',
+  '�T' => 'Ρ',
+  '�U' => 'Σ',
+  '�V' => 'Τ',
+  '�W' => 'Υ',
+  '�X' => 'Φ',
+  '�Y' => 'Χ',
+  '�Z' => 'Ψ',
+  '�[' => 'Ω',
+  '�\\' => 'α',
+  '�]' => 'β',
+  '�^' => 'γ',
+  '�_' => 'δ',
+  '�`' => 'ε',
+  '�a' => 'ζ',
+  '�b' => 'η',
+  '�c' => 'θ',
+  '�d' => 'ι',
+  '�e' => 'κ',
+  '�f' => 'λ',
+  '�g' => 'μ',
+  '�h' => 'ν',
+  '�i' => 'ξ',
+  '�j' => 'ο',
+  '�k' => 'π',
+  '�l' => 'ρ',
+  '�m' => 'σ',
+  '�n' => 'τ',
+  '�o' => 'υ',
+  '�p' => 'φ',
+  '�q' => 'χ',
+  '�r' => 'ψ',
+  '�s' => 'ω',
+  '�t' => 'ㄅ',
+  '�u' => 'ㄆ',
+  '�v' => 'ㄇ',
+  '�w' => 'ㄈ',
+  '�x' => 'ㄉ',
+  '�y' => 'ㄊ',
+  '�z' => 'ㄋ',
+  '�{' => 'ㄌ',
+  '�|' => 'ㄍ',
+  '�}' => 'ㄎ',
+  '�~' => 'ㄏ',
+  '��' => 'ㄐ',
+  '��' => 'ㄑ',
+  '��' => 'ㄒ',
+  '��' => 'ㄓ',
+  '��' => 'ㄔ',
+  '��' => 'ㄕ',
+  '��' => 'ㄖ',
+  '��' => 'ㄗ',
+  '��' => 'ㄘ',
+  '��' => 'ㄙ',
+  '��' => 'ㄚ',
+  '��' => 'ㄛ',
+  '��' => 'ㄜ',
+  '��' => 'ㄝ',
+  '��' => 'ㄞ',
+  '��' => 'ㄟ',
+  '��' => 'ㄠ',
+  '��' => 'ㄡ',
+  '��' => 'ㄢ',
+  '��' => 'ㄣ',
+  '��' => 'ㄤ',
+  '��' => 'ㄥ',
+  '��' => 'ㄦ',
+  '��' => 'ㄧ',
+  '��' => 'ㄨ',
+  '��' => 'ㄩ',
+  '��' => '˙',
+  '��' => 'ˉ',
+  '��' => 'ˊ',
+  '��' => 'ˇ',
+  '��' => 'ˋ',
+  '�@' => '一',
+  '�A' => '乙',
+  '�B' => '丁',
+  '�C' => '七',
+  '�D' => '乃',
+  '�E' => '九',
+  '�F' => '了',
+  '�G' => '二',
+  '�H' => '人',
+  '�I' => '儿',
+  '�J' => '入',
+  '�K' => '八',
+  '�L' => '几',
+  '�M' => '刀',
+  '�N' => '刁',
+  '�O' => '力',
+  '�P' => '匕',
+  '�Q' => '十',
+  '�R' => '卜',
+  '�S' => '又',
+  '�T' => '三',
+  '�U' => '下',
+  '�V' => '丈',
+  '�W' => '上',
+  '�X' => '丫',
+  '�Y' => '丸',
+  '�Z' => '凡',
+  '�[' => '久',
+  '�\\' => '么',
+  '�]' => '也',
+  '�^' => '乞',
+  '�_' => '于',
+  '�`' => '亡',
+  '�a' => '兀',
+  '�b' => '刃',
+  '�c' => '勺',
+  '�d' => '千',
+  '�e' => '叉',
+  '�f' => '口',
+  '�g' => '土',
+  '�h' => '士',
+  '�i' => '夕',
+  '�j' => '大',
+  '�k' => '女',
+  '�l' => '子',
+  '�m' => '孑',
+  '�n' => '孓',
+  '�o' => '寸',
+  '�p' => '小',
+  '�q' => '尢',
+  '�r' => '尸',
+  '�s' => '山',
+  '�t' => '川',
+  '�u' => '工',
+  '�v' => '己',
+  '�w' => '已',
+  '�x' => '巳',
+  '�y' => '巾',
+  '�z' => '干',
+  '�{' => '廾',
+  '�|' => '弋',
+  '�}' => '弓',
+  '�~' => '才',
+  '��' => '丑',
+  '��' => '丐',
+  '��' => '不',
+  '��' => '中',
+  '��' => '丰',
+  '��' => '丹',
+  '��' => '之',
+  '��' => '尹',
+  '��' => '予',
+  '��' => '云',
+  '��' => '井',
+  '��' => '互',
+  '��' => '五',
+  '��' => '亢',
+  '��' => '仁',
+  '��' => '什',
+  '��' => '仃',
+  '��' => '仆',
+  '��' => '仇',
+  '��' => '仍',
+  '��' => '今',
+  '��' => '介',
+  '��' => '仄',
+  '��' => '元',
+  '��' => '允',
+  '��' => '內',
+  '��' => '六',
+  '��' => '兮',
+  '��' => '公',
+  '��' => '冗',
+  '��' => '凶',
+  '��' => '分',
+  '��' => '切',
+  '��' => '刈',
+  '��' => '勻',
+  '��' => '勾',
+  '��' => '勿',
+  '��' => '化',
+  '��' => '匹',
+  '��' => '午',
+  '��' => '升',
+  '��' => '卅',
+  '��' => '卞',
+  '��' => '厄',
+  '��' => '友',
+  '��' => '及',
+  '��' => '反',
+  '��' => '壬',
+  '��' => '天',
+  '��' => '夫',
+  '��' => '太',
+  '��' => '夭',
+  '��' => '孔',
+  '��' => '少',
+  '��' => '尤',
+  '��' => '尺',
+  '��' => '屯',
+  '��' => '巴',
+  '��' => '幻',
+  '��' => '廿',
+  '��' => '弔',
+  '��' => '引',
+  '��' => '心',
+  '��' => '戈',
+  '��' => '戶',
+  '��' => '手',
+  '��' => '扎',
+  '��' => '支',
+  '��' => '文',
+  '��' => '斗',
+  '��' => '斤',
+  '��' => '方',
+  '��' => '日',
+  '��' => '曰',
+  '��' => '月',
+  '��' => '木',
+  '��' => '欠',
+  '��' => '止',
+  '��' => '歹',
+  '��' => '毋',
+  '��' => '比',
+  '��' => '毛',
+  '��' => '氏',
+  '��' => '水',
+  '��' => '火',
+  '��' => '爪',
+  '��' => '父',
+  '��' => '爻',
+  '��' => '片',
+  '��' => '牙',
+  '��' => '牛',
+  '��' => '犬',
+  '��' => '王',
+  '��' => '丙',
+  '�@' => '世',
+  '�A' => '丕',
+  '�B' => '且',
+  '�C' => '丘',
+  '�D' => '主',
+  '�E' => '乍',
+  '�F' => '乏',
+  '�G' => '乎',
+  '�H' => '以',
+  '�I' => '付',
+  '�J' => '仔',
+  '�K' => '仕',
+  '�L' => '他',
+  '�M' => '仗',
+  '�N' => '代',
+  '�O' => '令',
+  '�P' => '仙',
+  '�Q' => '仞',
+  '�R' => '充',
+  '�S' => '兄',
+  '�T' => '冉',
+  '�U' => '冊',
+  '�V' => '冬',
+  '�W' => '凹',
+  '�X' => '出',
+  '�Y' => '凸',
+  '�Z' => '刊',
+  '�[' => '加',
+  '�\\' => '功',
+  '�]' => '包',
+  '�^' => '匆',
+  '�_' => '北',
+  '�`' => '匝',
+  '�a' => '仟',
+  '�b' => '半',
+  '�c' => '卉',
+  '�d' => '卡',
+  '�e' => '占',
+  '�f' => '卯',
+  '�g' => '卮',
+  '�h' => '去',
+  '�i' => '可',
+  '�j' => '古',
+  '�k' => '右',
+  '�l' => '召',
+  '�m' => '叮',
+  '�n' => '叩',
+  '�o' => '叨',
+  '�p' => '叼',
+  '�q' => '司',
+  '�r' => '叵',
+  '�s' => '叫',
+  '�t' => '另',
+  '�u' => '只',
+  '�v' => '史',
+  '�w' => '叱',
+  '�x' => '台',
+  '�y' => '句',
+  '�z' => '叭',
+  '�{' => '叻',
+  '�|' => '四',
+  '�}' => '囚',
+  '�~' => '外',
+  '��' => '央',
+  '��' => '失',
+  '��' => '奴',
+  '��' => '奶',
+  '��' => '孕',
+  '��' => '它',
+  '��' => '尼',
+  '��' => '巨',
+  '��' => '巧',
+  '��' => '左',
+  '��' => '市',
+  '��' => '布',
+  '��' => '平',
+  '��' => '幼',
+  '��' => '弁',
+  '��' => '弘',
+  '��' => '弗',
+  '��' => '必',
+  '��' => '戊',
+  '��' => '打',
+  '��' => '扔',
+  '��' => '扒',
+  '��' => '扑',
+  '��' => '斥',
+  '��' => '旦',
+  '��' => '朮',
+  '��' => '本',
+  '��' => '未',
+  '��' => '末',
+  '��' => '札',
+  '��' => '正',
+  '��' => '母',
+  '��' => '民',
+  '��' => '氐',
+  '��' => '永',
+  '��' => '汁',
+  '��' => '汀',
+  '��' => '氾',
+  '��' => '犯',
+  '��' => '玄',
+  '��' => '玉',
+  '��' => '瓜',
+  '��' => '瓦',
+  '��' => '甘',
+  '��' => '生',
+  '��' => '用',
+  '��' => '甩',
+  '��' => '田',
+  '��' => '由',
+  '��' => '甲',
+  '��' => '申',
+  '��' => '疋',
+  '��' => '白',
+  '��' => '皮',
+  '��' => '皿',
+  '��' => '目',
+  '��' => '矛',
+  '��' => '矢',
+  '��' => '石',
+  '��' => '示',
+  '��' => '禾',
+  '��' => '穴',
+  '��' => '立',
+  '��' => '丞',
+  '��' => '丟',
+  '��' => '乒',
+  '��' => '乓',
+  '��' => '乩',
+  '��' => '亙',
+  '��' => '交',
+  '��' => '亦',
+  '��' => '亥',
+  '��' => '仿',
+  '��' => '伉',
+  '��' => '伙',
+  '��' => '伊',
+  '��' => '伕',
+  '��' => '伍',
+  '��' => '伐',
+  '��' => '休',
+  '��' => '伏',
+  '��' => '仲',
+  '��' => '件',
+  '��' => '任',
+  '��' => '仰',
+  '��' => '仳',
+  '��' => '份',
+  '��' => '企',
+  '��' => '伋',
+  '��' => '光',
+  '��' => '兇',
+  '��' => '兆',
+  '��' => '先',
+  '��' => '全',
+  '�@' => '共',
+  '�A' => '再',
+  '�B' => '冰',
+  '�C' => '列',
+  '�D' => '刑',
+  '�E' => '划',
+  '�F' => '刎',
+  '�G' => '刖',
+  '�H' => '劣',
+  '�I' => '匈',
+  '�J' => '匡',
+  '�K' => '匠',
+  '�L' => '印',
+  '�M' => '危',
+  '�N' => '吉',
+  '�O' => '吏',
+  '�P' => '同',
+  '�Q' => '吊',
+  '�R' => '吐',
+  '�S' => '吁',
+  '�T' => '吋',
+  '�U' => '各',
+  '�V' => '向',
+  '�W' => '名',
+  '�X' => '合',
+  '�Y' => '吃',
+  '�Z' => '后',
+  '�[' => '吆',
+  '�\\' => '吒',
+  '�]' => '因',
+  '�^' => '回',
+  '�_' => '囝',
+  '�`' => '圳',
+  '�a' => '地',
+  '�b' => '在',
+  '�c' => '圭',
+  '�d' => '圬',
+  '�e' => '圯',
+  '�f' => '圩',
+  '�g' => '夙',
+  '�h' => '多',
+  '�i' => '夷',
+  '�j' => '夸',
+  '�k' => '妄',
+  '�l' => '奸',
+  '�m' => '妃',
+  '�n' => '好',
+  '�o' => '她',
+  '�p' => '如',
+  '�q' => '妁',
+  '�r' => '字',
+  '�s' => '存',
+  '�t' => '宇',
+  '�u' => '守',
+  '�v' => '宅',
+  '�w' => '安',
+  '�x' => '寺',
+  '�y' => '尖',
+  '�z' => '屹',
+  '�{' => '州',
+  '�|' => '帆',
+  '�}' => '并',
+  '�~' => '年',
+  '��' => '式',
+  '��' => '弛',
+  '��' => '忙',
+  '��' => '忖',
+  '��' => '戎',
+  '��' => '戌',
+  '��' => '戍',
+  '��' => '成',
+  '��' => '扣',
+  '��' => '扛',
+  '��' => '托',
+  '��' => '收',
+  '��' => '早',
+  '��' => '旨',
+  '��' => '旬',
+  '��' => '旭',
+  '��' => '曲',
+  '��' => '曳',
+  '��' => '有',
+  '��' => '朽',
+  '��' => '朴',
+  '��' => '朱',
+  '��' => '朵',
+  '��' => '次',
+  '��' => '此',
+  '��' => '死',
+  '��' => '氖',
+  '��' => '汝',
+  '��' => '汗',
+  '��' => '汙',
+  '��' => '江',
+  '��' => '池',
+  '��' => '汐',
+  '��' => '汕',
+  '��' => '污',
+  '��' => '汛',
+  '��' => '汍',
+  '��' => '汎',
+  '��' => '灰',
+  '��' => '牟',
+  '��' => '牝',
+  '��' => '百',
+  '��' => '竹',
+  '��' => '米',
+  '��' => '糸',
+  '��' => '缶',
+  '��' => '羊',
+  '��' => '羽',
+  '��' => '老',
+  '��' => '考',
+  '��' => '而',
+  '��' => '耒',
+  '��' => '耳',
+  '��' => '聿',
+  '��' => '肉',
+  '��' => '肋',
+  '��' => '肌',
+  '��' => '臣',
+  '��' => '自',
+  '��' => '至',
+  '��' => '臼',
+  '��' => '舌',
+  '��' => '舛',
+  '��' => '舟',
+  '��' => '艮',
+  '��' => '色',
+  '��' => '艾',
+  '��' => '虫',
+  '��' => '血',
+  '��' => '行',
+  '��' => '衣',
+  '��' => '西',
+  '��' => '阡',
+  '��' => '串',
+  '��' => '亨',
+  '��' => '位',
+  '��' => '住',
+  '��' => '佇',
+  '��' => '佗',
+  '��' => '佞',
+  '��' => '伴',
+  '��' => '佛',
+  '��' => '何',
+  '��' => '估',
+  '��' => '佐',
+  '��' => '佑',
+  '��' => '伽',
+  '��' => '伺',
+  '��' => '伸',
+  '��' => '佃',
+  '��' => '佔',
+  '��' => '似',
+  '��' => '但',
+  '��' => '佣',
+  '�@' => '作',
+  '�A' => '你',
+  '�B' => '伯',
+  '�C' => '低',
+  '�D' => '伶',
+  '�E' => '余',
+  '�F' => '佝',
+  '�G' => '佈',
+  '�H' => '佚',
+  '�I' => '兌',
+  '�J' => '克',
+  '�K' => '免',
+  '�L' => '兵',
+  '�M' => '冶',
+  '�N' => '冷',
+  '�O' => '別',
+  '�P' => '判',
+  '�Q' => '利',
+  '�R' => '刪',
+  '�S' => '刨',
+  '�T' => '劫',
+  '�U' => '助',
+  '�V' => '努',
+  '�W' => '劬',
+  '�X' => '匣',
+  '�Y' => '即',
+  '�Z' => '卵',
+  '�[' => '吝',
+  '�\\' => '吭',
+  '�]' => '吞',
+  '�^' => '吾',
+  '�_' => '否',
+  '�`' => '呎',
+  '�a' => '吧',
+  '�b' => '呆',
+  '�c' => '呃',
+  '�d' => '吳',
+  '�e' => '呈',
+  '�f' => '呂',
+  '�g' => '君',
+  '�h' => '吩',
+  '�i' => '告',
+  '�j' => '吹',
+  '�k' => '吻',
+  '�l' => '吸',
+  '�m' => '吮',
+  '�n' => '吵',
+  '�o' => '吶',
+  '�p' => '吠',
+  '�q' => '吼',
+  '�r' => '呀',
+  '�s' => '吱',
+  '�t' => '含',
+  '�u' => '吟',
+  '�v' => '听',
+  '�w' => '囪',
+  '�x' => '困',
+  '�y' => '囤',
+  '�z' => '囫',
+  '�{' => '坊',
+  '�|' => '坑',
+  '�}' => '址',
+  '�~' => '坍',
+  '��' => '均',
+  '��' => '坎',
+  '��' => '圾',
+  '��' => '坐',
+  '��' => '坏',
+  '��' => '圻',
+  '��' => '壯',
+  '��' => '夾',
+  '��' => '妝',
+  '��' => '妒',
+  '��' => '妨',
+  '��' => '妞',
+  '��' => '妣',
+  '��' => '妙',
+  '��' => '妖',
+  '��' => '妍',
+  '��' => '妤',
+  '��' => '妓',
+  '��' => '妊',
+  '��' => '妥',
+  '��' => '孝',
+  '��' => '孜',
+  '��' => '孚',
+  '��' => '孛',
+  '��' => '完',
+  '��' => '宋',
+  '��' => '宏',
+  '��' => '尬',
+  '��' => '局',
+  '��' => '屁',
+  '��' => '尿',
+  '��' => '尾',
+  '��' => '岐',
+  '��' => '岑',
+  '��' => '岔',
+  '��' => '岌',
+  '��' => '巫',
+  '��' => '希',
+  '��' => '序',
+  '��' => '庇',
+  '��' => '床',
+  '��' => '廷',
+  '��' => '弄',
+  '��' => '弟',
+  '��' => '彤',
+  '��' => '形',
+  '��' => '彷',
+  '��' => '役',
+  '��' => '忘',
+  '��' => '忌',
+  '��' => '志',
+  '��' => '忍',
+  '��' => '忱',
+  '��' => '快',
+  '��' => '忸',
+  '��' => '忪',
+  '��' => '戒',
+  '��' => '我',
+  '��' => '抄',
+  '��' => '抗',
+  '��' => '抖',
+  '��' => '技',
+  '��' => '扶',
+  '��' => '抉',
+  '��' => '扭',
+  '��' => '把',
+  '��' => '扼',
+  '��' => '找',
+  '��' => '批',
+  '��' => '扳',
+  '��' => '抒',
+  '��' => '扯',
+  '��' => '折',
+  '��' => '扮',
+  '��' => '投',
+  '��' => '抓',
+  '��' => '抑',
+  '��' => '抆',
+  '��' => '改',
+  '��' => '攻',
+  '��' => '攸',
+  '��' => '旱',
+  '��' => '更',
+  '��' => '束',
+  '��' => '李',
+  '��' => '杏',
+  '��' => '材',
+  '��' => '村',
+  '��' => '杜',
+  '��' => '杖',
+  '��' => '杞',
+  '��' => '杉',
+  '��' => '杆',
+  '��' => '杠',
+  '�@' => '杓',
+  '�A' => '杗',
+  '�B' => '步',
+  '�C' => '每',
+  '�D' => '求',
+  '�E' => '汞',
+  '�F' => '沙',
+  '�G' => '沁',
+  '�H' => '沈',
+  '�I' => '沉',
+  '�J' => '沅',
+  '�K' => '沛',
+  '�L' => '汪',
+  '�M' => '決',
+  '�N' => '沐',
+  '�O' => '汰',
+  '�P' => '沌',
+  '�Q' => '汨',
+  '�R' => '沖',
+  '�S' => '沒',
+  '�T' => '汽',
+  '�U' => '沃',
+  '�V' => '汲',
+  '�W' => '汾',
+  '�X' => '汴',
+  '�Y' => '沆',
+  '�Z' => '汶',
+  '�[' => '沍',
+  '�\\' => '沔',
+  '�]' => '沘',
+  '�^' => '沂',
+  '�_' => '灶',
+  '�`' => '灼',
+  '�a' => '災',
+  '�b' => '灸',
+  '�c' => '牢',
+  '�d' => '牡',
+  '�e' => '牠',
+  '�f' => '狄',
+  '�g' => '狂',
+  '�h' => '玖',
+  '�i' => '甬',
+  '�j' => '甫',
+  '�k' => '男',
+  '�l' => '甸',
+  '�m' => '皂',
+  '�n' => '盯',
+  '�o' => '矣',
+  '�p' => '私',
+  '�q' => '秀',
+  '�r' => '禿',
+  '�s' => '究',
+  '�t' => '系',
+  '�u' => '罕',
+  '�v' => '肖',
+  '�w' => '肓',
+  '�x' => '肝',
+  '�y' => '肘',
+  '�z' => '肛',
+  '�{' => '肚',
+  '�|' => '育',
+  '�}' => '良',
+  '�~' => '芒',
+  '��' => '芋',
+  '��' => '芍',
+  '��' => '見',
+  '��' => '角',
+  '��' => '言',
+  '��' => '谷',
+  '��' => '豆',
+  '��' => '豕',
+  '��' => '貝',
+  '��' => '赤',
+  '��' => '走',
+  '��' => '足',
+  '��' => '身',
+  '��' => '車',
+  '��' => '辛',
+  '��' => '辰',
+  '��' => '迂',
+  '��' => '迆',
+  '��' => '迅',
+  '��' => '迄',
+  '��' => '巡',
+  '��' => '邑',
+  '��' => '邢',
+  '��' => '邪',
+  '��' => '邦',
+  '��' => '那',
+  '��' => '酉',
+  '��' => '釆',
+  '��' => '里',
+  '��' => '防',
+  '��' => '阮',
+  '��' => '阱',
+  '��' => '阪',
+  '��' => '阬',
+  '��' => '並',
+  '��' => '乖',
+  '��' => '乳',
+  '��' => '事',
+  '��' => '些',
+  '��' => '亞',
+  '��' => '享',
+  '��' => '京',
+  '��' => '佯',
+  '��' => '依',
+  '��' => '侍',
+  '��' => '佳',
+  '��' => '使',
+  '��' => '佬',
+  '��' => '供',
+  '��' => '例',
+  '��' => '來',
+  '��' => '侃',
+  '��' => '佰',
+  '��' => '併',
+  '��' => '侈',
+  '��' => '佩',
+  '��' => '佻',
+  '��' => '侖',
+  '��' => '佾',
+  '��' => '侏',
+  '��' => '侑',
+  '��' => '佺',
+  '��' => '兔',
+  '��' => '兒',
+  '��' => '兕',
+  '��' => '兩',
+  '��' => '具',
+  '��' => '其',
+  '��' => '典',
+  '��' => '冽',
+  '��' => '函',
+  '��' => '刻',
+  '��' => '券',
+  '��' => '刷',
+  '��' => '刺',
+  '��' => '到',
+  '��' => '刮',
+  '��' => '制',
+  '��' => '剁',
+  '��' => '劾',
+  '��' => '劻',
+  '��' => '卒',
+  '��' => '協',
+  '��' => '卓',
+  '��' => '卑',
+  '��' => '卦',
+  '��' => '卷',
+  '��' => '卸',
+  '��' => '卹',
+  '��' => '取',
+  '��' => '叔',
+  '��' => '受',
+  '��' => '味',
+  '��' => '呵',
+  '�@' => '咖',
+  '�A' => '呸',
+  '�B' => '咕',
+  '�C' => '咀',
+  '�D' => '呻',
+  '�E' => '呷',
+  '�F' => '咄',
+  '�G' => '咒',
+  '�H' => '咆',
+  '�I' => '呼',
+  '�J' => '咐',
+  '�K' => '呱',
+  '�L' => '呶',
+  '�M' => '和',
+  '�N' => '咚',
+  '�O' => '呢',
+  '�P' => '周',
+  '�Q' => '咋',
+  '�R' => '命',
+  '�S' => '咎',
+  '�T' => '固',
+  '�U' => '垃',
+  '�V' => '坷',
+  '�W' => '坪',
+  '�X' => '坩',
+  '�Y' => '坡',
+  '�Z' => '坦',
+  '�[' => '坤',
+  '�\\' => '坼',
+  '�]' => '夜',
+  '�^' => '奉',
+  '�_' => '奇',
+  '�`' => '奈',
+  '�a' => '奄',
+  '�b' => '奔',
+  '�c' => '妾',
+  '�d' => '妻',
+  '�e' => '委',
+  '�f' => '妹',
+  '�g' => '妮',
+  '�h' => '姑',
+  '�i' => '姆',
+  '�j' => '姐',
+  '�k' => '姍',
+  '�l' => '始',
+  '�m' => '姓',
+  '�n' => '姊',
+  '�o' => '妯',
+  '�p' => '妳',
+  '�q' => '姒',
+  '�r' => '姅',
+  '�s' => '孟',
+  '�t' => '孤',
+  '�u' => '季',
+  '�v' => '宗',
+  '�w' => '定',
+  '�x' => '官',
+  '�y' => '宜',
+  '�z' => '宙',
+  '�{' => '宛',
+  '�|' => '尚',
+  '�}' => '屈',
+  '�~' => '居',
+  '��' => '屆',
+  '��' => '岷',
+  '��' => '岡',
+  '��' => '岸',
+  '��' => '岩',
+  '��' => '岫',
+  '��' => '岱',
+  '��' => '岳',
+  '��' => '帘',
+  '��' => '帚',
+  '��' => '帖',
+  '��' => '帕',
+  '��' => '帛',
+  '��' => '帑',
+  '��' => '幸',
+  '��' => '庚',
+  '��' => '店',
+  '��' => '府',
+  '��' => '底',
+  '��' => '庖',
+  '��' => '延',
+  '��' => '弦',
+  '��' => '弧',
+  '��' => '弩',
+  '��' => '往',
+  '��' => '征',
+  '��' => '彿',
+  '��' => '彼',
+  '��' => '忝',
+  '��' => '忠',
+  '��' => '忽',
+  '��' => '念',
+  '��' => '忿',
+  '��' => '怏',
+  '��' => '怔',
+  '��' => '怯',
+  '��' => '怵',
+  '��' => '怖',
+  '��' => '怪',
+  '��' => '怕',
+  '��' => '怡',
+  '��' => '性',
+  '��' => '怩',
+  '��' => '怫',
+  '��' => '怛',
+  '��' => '或',
+  '��' => '戕',
+  '��' => '房',
+  '��' => '戾',
+  '��' => '所',
+  '��' => '承',
+  '��' => '拉',
+  '��' => '拌',
+  '��' => '拄',
+  '��' => '抿',
+  '��' => '拂',
+  '��' => '抹',
+  '��' => '拒',
+  '��' => '招',
+  '��' => '披',
+  '��' => '拓',
+  '��' => '拔',
+  '��' => '拋',
+  '��' => '拈',
+  '��' => '抨',
+  '��' => '抽',
+  '��' => '押',
+  '��' => '拐',
+  '��' => '拙',
+  '��' => '拇',
+  '��' => '拍',
+  '��' => '抵',
+  '��' => '拚',
+  '��' => '抱',
+  '��' => '拘',
+  '��' => '拖',
+  '��' => '拗',
+  '��' => '拆',
+  '��' => '抬',
+  '��' => '拎',
+  '��' => '放',
+  '��' => '斧',
+  '��' => '於',
+  '��' => '旺',
+  '��' => '昔',
+  '��' => '易',
+  '��' => '昌',
+  '��' => '昆',
+  '��' => '昂',
+  '��' => '明',
+  '��' => '昀',
+  '��' => '昏',
+  '��' => '昕',
+  '��' => '昊',
+  '�@' => '昇',
+  '�A' => '服',
+  '�B' => '朋',
+  '�C' => '杭',
+  '�D' => '枋',
+  '�E' => '枕',
+  '�F' => '東',
+  '�G' => '果',
+  '�H' => '杳',
+  '�I' => '杷',
+  '�J' => '枇',
+  '�K' => '枝',
+  '�L' => '林',
+  '�M' => '杯',
+  '�N' => '杰',
+  '�O' => '板',
+  '�P' => '枉',
+  '�Q' => '松',
+  '�R' => '析',
+  '�S' => '杵',
+  '�T' => '枚',
+  '�U' => '枓',
+  '�V' => '杼',
+  '�W' => '杪',
+  '�X' => '杲',
+  '�Y' => '欣',
+  '�Z' => '武',
+  '�[' => '歧',
+  '�\\' => '歿',
+  '�]' => '氓',
+  '�^' => '氛',
+  '�_' => '泣',
+  '�`' => '注',
+  '�a' => '泳',
+  '�b' => '沱',
+  '�c' => '泌',
+  '�d' => '泥',
+  '�e' => '河',
+  '�f' => '沽',
+  '�g' => '沾',
+  '�h' => '沼',
+  '�i' => '波',
+  '�j' => '沫',
+  '�k' => '法',
+  '�l' => '泓',
+  '�m' => '沸',
+  '�n' => '泄',
+  '�o' => '油',
+  '�p' => '況',
+  '�q' => '沮',
+  '�r' => '泗',
+  '�s' => '泅',
+  '�t' => '泱',
+  '�u' => '沿',
+  '�v' => '治',
+  '�w' => '泡',
+  '�x' => '泛',
+  '�y' => '泊',
+  '�z' => '沬',
+  '�{' => '泯',
+  '�|' => '泜',
+  '�}' => '泖',
+  '�~' => '泠',
+  '��' => '炕',
+  '��' => '炎',
+  '��' => '炒',
+  '��' => '炊',
+  '��' => '炙',
+  '��' => '爬',
+  '��' => '爭',
+  '��' => '爸',
+  '��' => '版',
+  '��' => '牧',
+  '��' => '物',
+  '��' => '狀',
+  '��' => '狎',
+  '��' => '狙',
+  '��' => '狗',
+  '��' => '狐',
+  '��' => '玩',
+  '��' => '玨',
+  '��' => '玟',
+  '��' => '玫',
+  '��' => '玥',
+  '��' => '甽',
+  '��' => '疝',
+  '��' => '疙',
+  '��' => '疚',
+  '��' => '的',
+  '��' => '盂',
+  '��' => '盲',
+  '��' => '直',
+  '��' => '知',
+  '��' => '矽',
+  '��' => '社',
+  '��' => '祀',
+  '��' => '祁',
+  '��' => '秉',
+  '��' => '秈',
+  '��' => '空',
+  '��' => '穹',
+  '��' => '竺',
+  '��' => '糾',
+  '��' => '罔',
+  '��' => '羌',
+  '��' => '羋',
+  '��' => '者',
+  '��' => '肺',
+  '��' => '肥',
+  '��' => '肢',
+  '��' => '肱',
+  '��' => '股',
+  '��' => '肫',
+  '��' => '肩',
+  '��' => '肴',
+  '��' => '肪',
+  '��' => '肯',
+  '��' => '臥',
+  '��' => '臾',
+  '��' => '舍',
+  '��' => '芳',
+  '��' => '芝',
+  '��' => '芙',
+  '��' => '芭',
+  '��' => '芽',
+  '��' => '芟',
+  '��' => '芹',
+  '��' => '花',
+  '��' => '芬',
+  '��' => '芥',
+  '��' => '芯',
+  '��' => '芸',
+  '��' => '芣',
+  '��' => '芰',
+  '��' => '芾',
+  '��' => '芷',
+  '��' => '虎',
+  '��' => '虱',
+  '��' => '初',
+  '��' => '表',
+  '��' => '軋',
+  '��' => '迎',
+  '��' => '返',
+  '��' => '近',
+  '��' => '邵',
+  '��' => '邸',
+  '��' => '邱',
+  '��' => '邶',
+  '��' => '采',
+  '��' => '金',
+  '��' => '長',
+  '��' => '門',
+  '��' => '阜',
+  '��' => '陀',
+  '��' => '阿',
+  '��' => '阻',
+  '��' => '附',
+  '�@' => '陂',
+  '�A' => '隹',
+  '�B' => '雨',
+  '�C' => '青',
+  '�D' => '非',
+  '�E' => '亟',
+  '�F' => '亭',
+  '�G' => '亮',
+  '�H' => '信',
+  '�I' => '侵',
+  '�J' => '侯',
+  '�K' => '便',
+  '�L' => '俠',
+  '�M' => '俑',
+  '�N' => '俏',
+  '�O' => '保',
+  '�P' => '促',
+  '�Q' => '侶',
+  '�R' => '俘',
+  '�S' => '俟',
+  '�T' => '俊',
+  '�U' => '俗',
+  '�V' => '侮',
+  '�W' => '俐',
+  '�X' => '俄',
+  '�Y' => '係',
+  '�Z' => '俚',
+  '�[' => '俎',
+  '�\\' => '俞',
+  '�]' => '侷',
+  '�^' => '兗',
+  '�_' => '冒',
+  '�`' => '冑',
+  '�a' => '冠',
+  '�b' => '剎',
+  '�c' => '剃',
+  '�d' => '削',
+  '�e' => '前',
+  '�f' => '剌',
+  '�g' => '剋',
+  '�h' => '則',
+  '�i' => '勇',
+  '�j' => '勉',
+  '�k' => '勃',
+  '�l' => '勁',
+  '�m' => '匍',
+  '�n' => '南',
+  '�o' => '卻',
+  '�p' => '厚',
+  '�q' => '叛',
+  '�r' => '咬',
+  '�s' => '哀',
+  '�t' => '咨',
+  '�u' => '哎',
+  '�v' => '哉',
+  '�w' => '咸',
+  '�x' => '咦',
+  '�y' => '咳',
+  '�z' => '哇',
+  '�{' => '哂',
+  '�|' => '咽',
+  '�}' => '咪',
+  '�~' => '品',
+  '��' => '哄',
+  '��' => '哈',
+  '��' => '咯',
+  '��' => '咫',
+  '��' => '咱',
+  '��' => '咻',
+  '��' => '咩',
+  '��' => '咧',
+  '��' => '咿',
+  '��' => '囿',
+  '��' => '垂',
+  '��' => '型',
+  '��' => '垠',
+  '��' => '垣',
+  '��' => '垢',
+  '��' => '城',
+  '��' => '垮',
+  '��' => '垓',
+  '��' => '奕',
+  '��' => '契',
+  '��' => '奏',
+  '��' => '奎',
+  '��' => '奐',
+  '��' => '姜',
+  '��' => '姘',
+  '��' => '姿',
+  '��' => '姣',
+  '��' => '姨',
+  '��' => '娃',
+  '��' => '姥',
+  '��' => '姪',
+  '��' => '姚',
+  '��' => '姦',
+  '��' => '威',
+  '��' => '姻',
+  '��' => '孩',
+  '��' => '宣',
+  '��' => '宦',
+  '��' => '室',
+  '��' => '客',
+  '��' => '宥',
+  '��' => '封',
+  '��' => '屎',
+  '��' => '屏',
+  '��' => '屍',
+  '��' => '屋',
+  '��' => '峙',
+  '��' => '峒',
+  '��' => '巷',
+  '��' => '帝',
+  '��' => '帥',
+  '��' => '帟',
+  '��' => '幽',
+  '��' => '庠',
+  '��' => '度',
+  '��' => '建',
+  '��' => '弈',
+  '��' => '弭',
+  '��' => '彥',
+  '��' => '很',
+  '��' => '待',
+  '��' => '徊',
+  '��' => '律',
+  '��' => '徇',
+  '��' => '後',
+  '��' => '徉',
+  '��' => '怒',
+  '��' => '思',
+  '��' => '怠',
+  '��' => '急',
+  '��' => '怎',
+  '��' => '怨',
+  '��' => '恍',
+  '��' => '恰',
+  '��' => '恨',
+  '��' => '恢',
+  '��' => '恆',
+  '��' => '恃',
+  '��' => '恬',
+  '��' => '恫',
+  '��' => '恪',
+  '��' => '恤',
+  '��' => '扁',
+  '��' => '拜',
+  '��' => '挖',
+  '��' => '按',
+  '��' => '拼',
+  '��' => '拭',
+  '��' => '持',
+  '��' => '拮',
+  '��' => '拽',
+  '��' => '指',
+  '��' => '拱',
+  '��' => '拷',
+  '�@' => '拯',
+  '�A' => '括',
+  '�B' => '拾',
+  '�C' => '拴',
+  '�D' => '挑',
+  '�E' => '挂',
+  '�F' => '政',
+  '�G' => '故',
+  '�H' => '斫',
+  '�I' => '施',
+  '�J' => '既',
+  '�K' => '春',
+  '�L' => '昭',
+  '�M' => '映',
+  '�N' => '昧',
+  '�O' => '是',
+  '�P' => '星',
+  '�Q' => '昨',
+  '�R' => '昱',
+  '�S' => '昤',
+  '�T' => '曷',
+  '�U' => '柿',
+  '�V' => '染',
+  '�W' => '柱',
+  '�X' => '柔',
+  '�Y' => '某',
+  '�Z' => '柬',
+  '�[' => '架',
+  '�\\' => '枯',
+  '�]' => '柵',
+  '�^' => '柩',
+  '�_' => '柯',
+  '�`' => '柄',
+  '�a' => '柑',
+  '�b' => '枴',
+  '�c' => '柚',
+  '�d' => '查',
+  '�e' => '枸',
+  '�f' => '柏',
+  '�g' => '柞',
+  '�h' => '柳',
+  '�i' => '枰',
+  '�j' => '柙',
+  '�k' => '柢',
+  '�l' => '柝',
+  '�m' => '柒',
+  '�n' => '歪',
+  '�o' => '殃',
+  '�p' => '殆',
+  '�q' => '段',
+  '�r' => '毒',
+  '�s' => '毗',
+  '�t' => '氟',
+  '�u' => '泉',
+  '�v' => '洋',
+  '�w' => '洲',
+  '�x' => '洪',
+  '�y' => '流',
+  '�z' => '津',
+  '�{' => '洌',
+  '�|' => '洱',
+  '�}' => '洞',
+  '�~' => '洗',
+  '��' => '活',
+  '��' => '洽',
+  '��' => '派',
+  '��' => '洶',
+  '��' => '洛',
+  '��' => '泵',
+  '��' => '洹',
+  '��' => '洧',
+  '��' => '洸',
+  '��' => '洩',
+  '��' => '洮',
+  '��' => '洵',
+  '��' => '洎',
+  '��' => '洫',
+  '��' => '炫',
+  '��' => '為',
+  '��' => '炳',
+  '��' => '炬',
+  '��' => '炯',
+  '��' => '炭',
+  '��' => '炸',
+  '��' => '炮',
+  '��' => '炤',
+  '��' => '爰',
+  '��' => '牲',
+  '��' => '牯',
+  '��' => '牴',
+  '��' => '狩',
+  '��' => '狠',
+  '��' => '狡',
+  '��' => '玷',
+  '��' => '珊',
+  '��' => '玻',
+  '��' => '玲',
+  '��' => '珍',
+  '��' => '珀',
+  '��' => '玳',
+  '��' => '甚',
+  '��' => '甭',
+  '��' => '畏',
+  '��' => '界',
+  '��' => '畎',
+  '��' => '畋',
+  '��' => '疫',
+  '��' => '疤',
+  '��' => '疥',
+  '��' => '疢',
+  '��' => '疣',
+  '��' => '癸',
+  '��' => '皆',
+  '��' => '皇',
+  '��' => '皈',
+  '��' => '盈',
+  '��' => '盆',
+  '��' => '盃',
+  '��' => '盅',
+  '��' => '省',
+  '��' => '盹',
+  '��' => '相',
+  '��' => '眉',
+  '��' => '看',
+  '��' => '盾',
+  '��' => '盼',
+  '��' => '眇',
+  '��' => '矜',
+  '��' => '砂',
+  '��' => '研',
+  '��' => '砌',
+  '��' => '砍',
+  '��' => '祆',
+  '��' => '祉',
+  '��' => '祈',
+  '��' => '祇',
+  '��' => '禹',
+  '��' => '禺',
+  '��' => '科',
+  '��' => '秒',
+  '��' => '秋',
+  '��' => '穿',
+  '��' => '突',
+  '��' => '竿',
+  '��' => '竽',
+  '��' => '籽',
+  '��' => '紂',
+  '��' => '紅',
+  '��' => '紀',
+  '��' => '紉',
+  '��' => '紇',
+  '��' => '約',
+  '��' => '紆',
+  '��' => '缸',
+  '��' => '美',
+  '��' => '羿',
+  '��' => '耄',
+  '�@' => '耐',
+  '�A' => '耍',
+  '�B' => '耑',
+  '�C' => '耶',
+  '�D' => '胖',
+  '�E' => '胥',
+  '�F' => '胚',
+  '�G' => '胃',
+  '�H' => '胄',
+  '�I' => '背',
+  '�J' => '胡',
+  '�K' => '胛',
+  '�L' => '胎',
+  '�M' => '胞',
+  '�N' => '胤',
+  '�O' => '胝',
+  '�P' => '致',
+  '�Q' => '舢',
+  '�R' => '苧',
+  '�S' => '范',
+  '�T' => '茅',
+  '�U' => '苣',
+  '�V' => '苛',
+  '�W' => '苦',
+  '�X' => '茄',
+  '�Y' => '若',
+  '�Z' => '茂',
+  '�[' => '茉',
+  '�\\' => '苒',
+  '�]' => '苗',
+  '�^' => '英',
+  '�_' => '茁',
+  '�`' => '苜',
+  '�a' => '苔',
+  '�b' => '苑',
+  '�c' => '苞',
+  '�d' => '苓',
+  '�e' => '苟',
+  '�f' => '苯',
+  '�g' => '茆',
+  '�h' => '虐',
+  '�i' => '虹',
+  '�j' => '虻',
+  '�k' => '虺',
+  '�l' => '衍',
+  '�m' => '衫',
+  '�n' => '要',
+  '�o' => '觔',
+  '�p' => '計',
+  '�q' => '訂',
+  '�r' => '訃',
+  '�s' => '貞',
+  '�t' => '負',
+  '�u' => '赴',
+  '�v' => '赳',
+  '�w' => '趴',
+  '�x' => '軍',
+  '�y' => '軌',
+  '�z' => '述',
+  '�{' => '迦',
+  '�|' => '迢',
+  '�}' => '迪',
+  '�~' => '迥',
+  '��' => '迭',
+  '��' => '迫',
+  '��' => '迤',
+  '��' => '迨',
+  '��' => '郊',
+  '��' => '郎',
+  '��' => '郁',
+  '��' => '郃',
+  '��' => '酋',
+  '��' => '酊',
+  '��' => '重',
+  '��' => '閂',
+  '��' => '限',
+  '��' => '陋',
+  '��' => '陌',
+  '��' => '降',
+  '��' => '面',
+  '��' => '革',
+  '��' => '韋',
+  '��' => '韭',
+  '��' => '音',
+  '��' => '頁',
+  '��' => '風',
+  '��' => '飛',
+  '��' => '食',
+  '��' => '首',
+  '��' => '香',
+  '��' => '乘',
+  '��' => '亳',
+  '��' => '倌',
+  '��' => '倍',
+  '��' => '倣',
+  '��' => '俯',
+  '��' => '倦',
+  '��' => '倥',
+  '��' => '俸',
+  '��' => '倩',
+  '��' => '倖',
+  '��' => '倆',
+  '��' => '值',
+  '��' => '借',
+  '��' => '倚',
+  '��' => '倒',
+  '��' => '們',
+  '��' => '俺',
+  '��' => '倀',
+  '��' => '倔',
+  '��' => '倨',
+  '��' => '俱',
+  '��' => '倡',
+  '��' => '個',
+  '��' => '候',
+  '��' => '倘',
+  '��' => '俳',
+  '��' => '修',
+  '��' => '倭',
+  '��' => '倪',
+  '��' => '俾',
+  '��' => '倫',
+  '��' => '倉',
+  '��' => '兼',
+  '��' => '冤',
+  '��' => '冥',
+  '��' => '冢',
+  '��' => '凍',
+  '��' => '凌',
+  '��' => '准',
+  '��' => '凋',
+  '��' => '剖',
+  '��' => '剜',
+  '��' => '剔',
+  '��' => '剛',
+  '��' => '剝',
+  '��' => '匪',
+  '��' => '卿',
+  '��' => '原',
+  '��' => '厝',
+  '��' => '叟',
+  '��' => '哨',
+  '��' => '唐',
+  '��' => '唁',
+  '��' => '唷',
+  '��' => '哼',
+  '��' => '哥',
+  '��' => '哲',
+  '��' => '唆',
+  '��' => '哺',
+  '��' => '唔',
+  '��' => '哩',
+  '��' => '哭',
+  '��' => '員',
+  '��' => '唉',
+  '��' => '哮',
+  '��' => '哪',
+  '�@' => '哦',
+  '�A' => '唧',
+  '�B' => '唇',
+  '�C' => '哽',
+  '�D' => '唏',
+  '�E' => '圃',
+  '�F' => '圄',
+  '�G' => '埂',
+  '�H' => '埔',
+  '�I' => '埋',
+  '�J' => '埃',
+  '�K' => '堉',
+  '�L' => '夏',
+  '�M' => '套',
+  '�N' => '奘',
+  '�O' => '奚',
+  '�P' => '娑',
+  '�Q' => '娘',
+  '�R' => '娜',
+  '�S' => '娟',
+  '�T' => '娛',
+  '�U' => '娓',
+  '�V' => '姬',
+  '�W' => '娠',
+  '�X' => '娣',
+  '�Y' => '娩',
+  '�Z' => '娥',
+  '�[' => '娌',
+  '�\\' => '娉',
+  '�]' => '孫',
+  '�^' => '屘',
+  '�_' => '宰',
+  '�`' => '害',
+  '�a' => '家',
+  '�b' => '宴',
+  '�c' => '宮',
+  '�d' => '宵',
+  '�e' => '容',
+  '�f' => '宸',
+  '�g' => '射',
+  '�h' => '屑',
+  '�i' => '展',
+  '�j' => '屐',
+  '�k' => '峭',
+  '�l' => '峽',
+  '�m' => '峻',
+  '�n' => '峪',
+  '�o' => '峨',
+  '�p' => '峰',
+  '�q' => '島',
+  '�r' => '崁',
+  '�s' => '峴',
+  '�t' => '差',
+  '�u' => '席',
+  '�v' => '師',
+  '�w' => '庫',
+  '�x' => '庭',
+  '�y' => '座',
+  '�z' => '弱',
+  '�{' => '徒',
+  '�|' => '徑',
+  '�}' => '徐',
+  '�~' => '恙',
+  '��' => '恣',
+  '��' => '恥',
+  '��' => '恐',
+  '��' => '恕',
+  '��' => '恭',
+  '��' => '恩',
+  '��' => '息',
+  '��' => '悄',
+  '��' => '悟',
+  '��' => '悚',
+  '��' => '悍',
+  '��' => '悔',
+  '��' => '悌',
+  '��' => '悅',
+  '��' => '悖',
+  '��' => '扇',
+  '��' => '拳',
+  '��' => '挈',
+  '��' => '拿',
+  '��' => '捎',
+  '��' => '挾',
+  '��' => '振',
+  '��' => '捕',
+  '��' => '捂',
+  '��' => '捆',
+  '��' => '捏',
+  '��' => '捉',
+  '��' => '挺',
+  '��' => '捐',
+  '��' => '挽',
+  '��' => '挪',
+  '��' => '挫',
+  '��' => '挨',
+  '��' => '捍',
+  '��' => '捌',
+  '��' => '效',
+  '��' => '敉',
+  '��' => '料',
+  '��' => '旁',
+  '��' => '旅',
+  '��' => '時',
+  '��' => '晉',
+  '��' => '晏',
+  '��' => '晃',
+  '��' => '晒',
+  '��' => '晌',
+  '��' => '晅',
+  '��' => '晁',
+  '��' => '書',
+  '��' => '朔',
+  '��' => '朕',
+  '��' => '朗',
+  '��' => '校',
+  '��' => '核',
+  '��' => '案',
+  '��' => '框',
+  '��' => '桓',
+  '��' => '根',
+  '��' => '桂',
+  '��' => '桔',
+  '��' => '栩',
+  '��' => '梳',
+  '��' => '栗',
+  '��' => '桌',
+  '��' => '桑',
+  '��' => '栽',
+  '��' => '柴',
+  '��' => '桐',
+  '��' => '桀',
+  '��' => '格',
+  '��' => '桃',
+  '��' => '株',
+  '��' => '桅',
+  '��' => '栓',
+  '��' => '栘',
+  '��' => '桁',
+  '��' => '殊',
+  '��' => '殉',
+  '��' => '殷',
+  '��' => '氣',
+  '��' => '氧',
+  '��' => '氨',
+  '��' => '氦',
+  '��' => '氤',
+  '��' => '泰',
+  '��' => '浪',
+  '��' => '涕',
+  '��' => '消',
+  '��' => '涇',
+  '��' => '浦',
+  '��' => '浸',
+  '��' => '海',
+  '��' => '浙',
+  '��' => '涓',
+  '�@' => '浬',
+  '�A' => '涉',
+  '�B' => '浮',
+  '�C' => '浚',
+  '�D' => '浴',
+  '�E' => '浩',
+  '�F' => '涌',
+  '�G' => '涊',
+  '�H' => '浹',
+  '�I' => '涅',
+  '�J' => '浥',
+  '�K' => '涔',
+  '�L' => '烊',
+  '�M' => '烘',
+  '�N' => '烤',
+  '�O' => '烙',
+  '�P' => '烈',
+  '�Q' => '烏',
+  '�R' => '爹',
+  '�S' => '特',
+  '�T' => '狼',
+  '�U' => '狹',
+  '�V' => '狽',
+  '�W' => '狸',
+  '�X' => '狷',
+  '�Y' => '玆',
+  '�Z' => '班',
+  '�[' => '琉',
+  '�\\' => '珮',
+  '�]' => '珠',
+  '�^' => '珪',
+  '�_' => '珞',
+  '�`' => '畔',
+  '�a' => '畝',
+  '�b' => '畜',
+  '�c' => '畚',
+  '�d' => '留',
+  '�e' => '疾',
+  '�f' => '病',
+  '�g' => '症',
+  '�h' => '疲',
+  '�i' => '疳',
+  '�j' => '疽',
+  '�k' => '疼',
+  '�l' => '疹',
+  '�m' => '痂',
+  '�n' => '疸',
+  '�o' => '皋',
+  '�p' => '皰',
+  '�q' => '益',
+  '�r' => '盍',
+  '�s' => '盎',
+  '�t' => '眩',
+  '�u' => '真',
+  '�v' => '眠',
+  '�w' => '眨',
+  '�x' => '矩',
+  '�y' => '砰',
+  '�z' => '砧',
+  '�{' => '砸',
+  '�|' => '砝',
+  '�}' => '破',
+  '�~' => '砷',
+  '��' => '砥',
+  '��' => '砭',
+  '��' => '砠',
+  '��' => '砟',
+  '��' => '砲',
+  '��' => '祕',
+  '��' => '祐',
+  '��' => '祠',
+  '��' => '祟',
+  '��' => '祖',
+  '��' => '神',
+  '��' => '祝',
+  '��' => '祗',
+  '��' => '祚',
+  '��' => '秤',
+  '��' => '秣',
+  '��' => '秧',
+  '��' => '租',
+  '��' => '秦',
+  '��' => '秩',
+  '��' => '秘',
+  '��' => '窄',
+  '��' => '窈',
+  '��' => '站',
+  '��' => '笆',
+  '��' => '笑',
+  '��' => '粉',
+  '��' => '紡',
+  '��' => '紗',
+  '��' => '紋',
+  '��' => '紊',
+  '��' => '素',
+  '��' => '索',
+  '��' => '純',
+  '��' => '紐',
+  '��' => '紕',
+  '��' => '級',
+  '��' => '紜',
+  '��' => '納',
+  '��' => '紙',
+  '��' => '紛',
+  '��' => '缺',
+  '��' => '罟',
+  '��' => '羔',
+  '��' => '翅',
+  '��' => '翁',
+  '��' => '耆',
+  '��' => '耘',
+  '��' => '耕',
+  '��' => '耙',
+  '��' => '耗',
+  '��' => '耽',
+  '��' => '耿',
+  '��' => '胱',
+  '��' => '脂',
+  '��' => '胰',
+  '��' => '脅',
+  '��' => '胭',
+  '��' => '胴',
+  '��' => '脆',
+  '��' => '胸',
+  '��' => '胳',
+  '��' => '脈',
+  '��' => '能',
+  '��' => '脊',
+  '��' => '胼',
+  '��' => '胯',
+  '��' => '臭',
+  '��' => '臬',
+  '��' => '舀',
+  '��' => '舐',
+  '��' => '航',
+  '��' => '舫',
+  '��' => '舨',
+  '��' => '般',
+  '��' => '芻',
+  '��' => '茫',
+  '��' => '荒',
+  '��' => '荔',
+  '��' => '荊',
+  '��' => '茸',
+  '��' => '荐',
+  '��' => '草',
+  '��' => '茵',
+  '��' => '茴',
+  '��' => '荏',
+  '��' => '茲',
+  '��' => '茹',
+  '��' => '茶',
+  '��' => '茗',
+  '��' => '荀',
+  '��' => '茱',
+  '��' => '茨',
+  '��' => '荃',
+  '�@' => '虔',
+  '�A' => '蚊',
+  '�B' => '蚪',
+  '�C' => '蚓',
+  '�D' => '蚤',
+  '�E' => '蚩',
+  '�F' => '蚌',
+  '�G' => '蚣',
+  '�H' => '蚜',
+  '�I' => '衰',
+  '�J' => '衷',
+  '�K' => '袁',
+  '�L' => '袂',
+  '�M' => '衽',
+  '�N' => '衹',
+  '�O' => '記',
+  '�P' => '訐',
+  '�Q' => '討',
+  '�R' => '訌',
+  '�S' => '訕',
+  '�T' => '訊',
+  '�U' => '託',
+  '�V' => '訓',
+  '�W' => '訖',
+  '�X' => '訏',
+  '�Y' => '訑',
+  '�Z' => '豈',
+  '�[' => '豺',
+  '�\\' => '豹',
+  '�]' => '財',
+  '�^' => '貢',
+  '�_' => '起',
+  '�`' => '躬',
+  '�a' => '軒',
+  '�b' => '軔',
+  '�c' => '軏',
+  '�d' => '辱',
+  '�e' => '送',
+  '�f' => '逆',
+  '�g' => '迷',
+  '�h' => '退',
+  '�i' => '迺',
+  '�j' => '迴',
+  '�k' => '逃',
+  '�l' => '追',
+  '�m' => '逅',
+  '�n' => '迸',
+  '�o' => '邕',
+  '�p' => '郡',
+  '�q' => '郝',
+  '�r' => '郢',
+  '�s' => '酒',
+  '�t' => '配',
+  '�u' => '酌',
+  '�v' => '釘',
+  '�w' => '針',
+  '�x' => '釗',
+  '�y' => '釜',
+  '�z' => '釙',
+  '�{' => '閃',
+  '�|' => '院',
+  '�}' => '陣',
+  '�~' => '陡',
+  '��' => '陛',
+  '��' => '陝',
+  '��' => '除',
+  '��' => '陘',
+  '��' => '陞',
+  '��' => '隻',
+  '��' => '飢',
+  '��' => '馬',
+  '��' => '骨',
+  '��' => '高',
+  '��' => '鬥',
+  '��' => '鬲',
+  '��' => '鬼',
+  '��' => '乾',
+  '��' => '偺',
+  '��' => '偽',
+  '��' => '停',
+  '��' => '假',
+  '��' => '偃',
+  '��' => '偌',
+  '��' => '做',
+  '��' => '偉',
+  '��' => '健',
+  '��' => '偶',
+  '��' => '偎',
+  '��' => '偕',
+  '��' => '偵',
+  '��' => '側',
+  '��' => '偷',
+  '��' => '偏',
+  '��' => '倏',
+  '��' => '偯',
+  '��' => '偭',
+  '��' => '兜',
+  '��' => '冕',
+  '��' => '凰',
+  '��' => '剪',
+  '��' => '副',
+  '��' => '勒',
+  '��' => '務',
+  '��' => '勘',
+  '��' => '動',
+  '��' => '匐',
+  '��' => '匏',
+  '��' => '匙',
+  '��' => '匿',
+  '��' => '區',
+  '��' => '匾',
+  '��' => '參',
+  '��' => '曼',
+  '��' => '商',
+  '��' => '啪',
+  '��' => '啦',
+  '��' => '啄',
+  '��' => '啞',
+  '��' => '啡',
+  '��' => '啃',
+  '��' => '啊',
+  '��' => '唱',
+  '��' => '啖',
+  '��' => '問',
+  '��' => '啕',
+  '��' => '唯',
+  '��' => '啤',
+  '��' => '唸',
+  '��' => '售',
+  '��' => '啜',
+  '��' => '唬',
+  '��' => '啣',
+  '��' => '唳',
+  '��' => '啁',
+  '��' => '啗',
+  '��' => '圈',
+  '��' => '國',
+  '��' => '圉',
+  '��' => '域',
+  '��' => '堅',
+  '��' => '堊',
+  '��' => '堆',
+  '��' => '埠',
+  '��' => '埤',
+  '��' => '基',
+  '��' => '堂',
+  '��' => '堵',
+  '��' => '執',
+  '��' => '培',
+  '��' => '夠',
+  '��' => '奢',
+  '��' => '娶',
+  '��' => '婁',
+  '��' => '婉',
+  '��' => '婦',
+  '��' => '婪',
+  '��' => '婀',
+  '�@' => '娼',
+  '�A' => '婢',
+  '�B' => '婚',
+  '�C' => '婆',
+  '�D' => '婊',
+  '�E' => '孰',
+  '�F' => '寇',
+  '�G' => '寅',
+  '�H' => '寄',
+  '�I' => '寂',
+  '�J' => '宿',
+  '�K' => '密',
+  '�L' => '尉',
+  '�M' => '專',
+  '�N' => '將',
+  '�O' => '屠',
+  '�P' => '屜',
+  '�Q' => '屝',
+  '�R' => '崇',
+  '�S' => '崆',
+  '�T' => '崎',
+  '�U' => '崛',
+  '�V' => '崖',
+  '�W' => '崢',
+  '�X' => '崑',
+  '�Y' => '崩',
+  '�Z' => '崔',
+  '�[' => '崙',
+  '�\\' => '崤',
+  '�]' => '崧',
+  '�^' => '崗',
+  '�_' => '巢',
+  '�`' => '常',
+  '�a' => '帶',
+  '�b' => '帳',
+  '�c' => '帷',
+  '�d' => '康',
+  '�e' => '庸',
+  '�f' => '庶',
+  '�g' => '庵',
+  '�h' => '庾',
+  '�i' => '張',
+  '�j' => '強',
+  '�k' => '彗',
+  '�l' => '彬',
+  '�m' => '彩',
+  '�n' => '彫',
+  '�o' => '得',
+  '�p' => '徙',
+  '�q' => '從',
+  '�r' => '徘',
+  '�s' => '御',
+  '�t' => '徠',
+  '�u' => '徜',
+  '�v' => '恿',
+  '�w' => '患',
+  '�x' => '悉',
+  '�y' => '悠',
+  '�z' => '您',
+  '�{' => '惋',
+  '�|' => '悴',
+  '�}' => '惦',
+  '�~' => '悽',
+  '��' => '情',
+  '��' => '悻',
+  '��' => '悵',
+  '��' => '惜',
+  '��' => '悼',
+  '��' => '惘',
+  '��' => '惕',
+  '��' => '惆',
+  '��' => '惟',
+  '��' => '悸',
+  '��' => '惚',
+  '��' => '惇',
+  '��' => '戚',
+  '��' => '戛',
+  '��' => '扈',
+  '��' => '掠',
+  '��' => '控',
+  '��' => '捲',
+  '��' => '掖',
+  '��' => '探',
+  '��' => '接',
+  '��' => '捷',
+  '��' => '捧',
+  '��' => '掘',
+  '��' => '措',
+  '��' => '捱',
+  '��' => '掩',
+  '��' => '掉',
+  '��' => '掃',
+  '��' => '掛',
+  '��' => '捫',
+  '��' => '推',
+  '��' => '掄',
+  '��' => '授',
+  '��' => '掙',
+  '��' => '採',
+  '��' => '掬',
+  '��' => '排',
+  '��' => '掏',
+  '��' => '掀',
+  '��' => '捻',
+  '��' => '捩',
+  '��' => '捨',
+  '��' => '捺',
+  '��' => '敝',
+  '��' => '敖',
+  '��' => '救',
+  '��' => '教',
+  '��' => '敗',
+  '��' => '啟',
+  '��' => '敏',
+  '��' => '敘',
+  '��' => '敕',
+  '��' => '敔',
+  '��' => '斜',
+  '��' => '斛',
+  '��' => '斬',
+  '��' => '族',
+  '��' => '旋',
+  '��' => '旌',
+  '��' => '旎',
+  '��' => '晝',
+  '��' => '晚',
+  '��' => '晤',
+  '��' => '晨',
+  '��' => '晦',
+  '��' => '晞',
+  '��' => '曹',
+  '��' => '勗',
+  '��' => '望',
+  '��' => '梁',
+  '��' => '梯',
+  '��' => '梢',
+  '��' => '梓',
+  '��' => '梵',
+  '��' => '桿',
+  '��' => '桶',
+  '��' => '梱',
+  '��' => '梧',
+  '��' => '梗',
+  '��' => '械',
+  '��' => '梃',
+  '��' => '棄',
+  '��' => '梭',
+  '��' => '梆',
+  '��' => '梅',
+  '��' => '梔',
+  '��' => '條',
+  '��' => '梨',
+  '��' => '梟',
+  '��' => '梡',
+  '��' => '梂',
+  '��' => '欲',
+  '��' => '殺',
+  '�@' => '毫',
+  '�A' => '毬',
+  '�B' => '氫',
+  '�C' => '涎',
+  '�D' => '涼',
+  '�E' => '淳',
+  '�F' => '淙',
+  '�G' => '液',
+  '�H' => '淡',
+  '�I' => '淌',
+  '�J' => '淤',
+  '�K' => '添',
+  '�L' => '淺',
+  '�M' => '清',
+  '�N' => '淇',
+  '�O' => '淋',
+  '�P' => '涯',
+  '�Q' => '淑',
+  '�R' => '涮',
+  '�S' => '淞',
+  '�T' => '淹',
+  '�U' => '涸',
+  '�V' => '混',
+  '�W' => '淵',
+  '�X' => '淅',
+  '�Y' => '淒',
+  '�Z' => '渚',
+  '�[' => '涵',
+  '�\\' => '淚',
+  '�]' => '淫',
+  '�^' => '淘',
+  '�_' => '淪',
+  '�`' => '深',
+  '�a' => '淮',
+  '�b' => '淨',
+  '�c' => '淆',
+  '�d' => '淄',
+  '�e' => '涪',
+  '�f' => '淬',
+  '�g' => '涿',
+  '�h' => '淦',
+  '�i' => '烹',
+  '�j' => '焉',
+  '�k' => '焊',
+  '�l' => '烽',
+  '�m' => '烯',
+  '�n' => '爽',
+  '�o' => '牽',
+  '�p' => '犁',
+  '�q' => '猜',
+  '�r' => '猛',
+  '�s' => '猖',
+  '�t' => '猓',
+  '�u' => '猙',
+  '�v' => '率',
+  '�w' => '琅',
+  '�x' => '琊',
+  '�y' => '球',
+  '�z' => '理',
+  '�{' => '現',
+  '�|' => '琍',
+  '�}' => '瓠',
+  '�~' => '瓶',
+  '��' => '瓷',
+  '��' => '甜',
+  '��' => '產',
+  '��' => '略',
+  '��' => '畦',
+  '��' => '畢',
+  '��' => '異',
+  '��' => '疏',
+  '��' => '痔',
+  '��' => '痕',
+  '��' => '疵',
+  '��' => '痊',
+  '��' => '痍',
+  '��' => '皎',
+  '��' => '盔',
+  '��' => '盒',
+  '��' => '盛',
+  '��' => '眷',
+  '��' => '眾',
+  '��' => '眼',
+  '��' => '眶',
+  '��' => '眸',
+  '��' => '眺',
+  '��' => '硫',
+  '��' => '硃',
+  '��' => '硎',
+  '��' => '祥',
+  '��' => '票',
+  '��' => '祭',
+  '��' => '移',
+  '��' => '窒',
+  '��' => '窕',
+  '��' => '笠',
+  '��' => '笨',
+  '��' => '笛',
+  '��' => '第',
+  '��' => '符',
+  '��' => '笙',
+  '��' => '笞',
+  '��' => '笮',
+  '��' => '粒',
+  '��' => '粗',
+  '��' => '粕',
+  '��' => '絆',
+  '��' => '絃',
+  '��' => '統',
+  '��' => '紮',
+  '��' => '紹',
+  '��' => '紼',
+  '��' => '絀',
+  '��' => '細',
+  '��' => '紳',
+  '��' => '組',
+  '��' => '累',
+  '��' => '終',
+  '��' => '紲',
+  '��' => '紱',
+  '��' => '缽',
+  '��' => '羞',
+  '��' => '羚',
+  '��' => '翌',
+  '��' => '翎',
+  '��' => '習',
+  '��' => '耜',
+  '��' => '聊',
+  '��' => '聆',
+  '��' => '脯',
+  '��' => '脖',
+  '��' => '脣',
+  '��' => '脫',
+  '��' => '脩',
+  '��' => '脰',
+  '��' => '脤',
+  '��' => '舂',
+  '��' => '舵',
+  '��' => '舷',
+  '��' => '舶',
+  '��' => '船',
+  '��' => '莎',
+  '��' => '莞',
+  '��' => '莘',
+  '��' => '荸',
+  '��' => '莢',
+  '��' => '莖',
+  '��' => '莽',
+  '��' => '莫',
+  '��' => '莒',
+  '��' => '莊',
+  '��' => '莓',
+  '��' => '莉',
+  '��' => '莠',
+  '��' => '荷',
+  '��' => '荻',
+  '��' => '荼',
+  '�@' => '莆',
+  '�A' => '莧',
+  '�B' => '處',
+  '�C' => '彪',
+  '�D' => '蛇',
+  '�E' => '蛀',
+  '�F' => '蚶',
+  '�G' => '蛄',
+  '�H' => '蚵',
+  '�I' => '蛆',
+  '�J' => '蛋',
+  '�K' => '蚱',
+  '�L' => '蚯',
+  '�M' => '蛉',
+  '�N' => '術',
+  '�O' => '袞',
+  '�P' => '袈',
+  '�Q' => '被',
+  '�R' => '袒',
+  '�S' => '袖',
+  '�T' => '袍',
+  '�U' => '袋',
+  '�V' => '覓',
+  '�W' => '規',
+  '�X' => '訪',
+  '�Y' => '訝',
+  '�Z' => '訣',
+  '�[' => '訥',
+  '�\\' => '許',
+  '�]' => '設',
+  '�^' => '訟',
+  '�_' => '訛',
+  '�`' => '訢',
+  '�a' => '豉',
+  '�b' => '豚',
+  '�c' => '販',
+  '�d' => '責',
+  '�e' => '貫',
+  '�f' => '貨',
+  '�g' => '貪',
+  '�h' => '貧',
+  '�i' => '赧',
+  '�j' => '赦',
+  '�k' => '趾',
+  '�l' => '趺',
+  '�m' => '軛',
+  '�n' => '軟',
+  '�o' => '這',
+  '�p' => '逍',
+  '�q' => '通',
+  '�r' => '逗',
+  '�s' => '連',
+  '�t' => '速',
+  '�u' => '逝',
+  '�v' => '逐',
+  '�w' => '逕',
+  '�x' => '逞',
+  '�y' => '造',
+  '�z' => '透',
+  '�{' => '逢',
+  '�|' => '逖',
+  '�}' => '逛',
+  '�~' => '途',
+  '��' => '部',
+  '��' => '郭',
+  '��' => '都',
+  '��' => '酗',
+  '��' => '野',
+  '��' => '釵',
+  '��' => '釦',
+  '��' => '釣',
+  '��' => '釧',
+  '��' => '釭',
+  '��' => '釩',
+  '��' => '閉',
+  '��' => '陪',
+  '��' => '陵',
+  '��' => '陳',
+  '��' => '陸',
+  '��' => '陰',
+  '��' => '陴',
+  '��' => '陶',
+  '��' => '陷',
+  '��' => '陬',
+  '��' => '雀',
+  '��' => '雪',
+  '��' => '雩',
+  '��' => '章',
+  '��' => '竟',
+  '��' => '頂',
+  '��' => '頃',
+  '��' => '魚',
+  '��' => '鳥',
+  '��' => '鹵',
+  '��' => '鹿',
+  '��' => '麥',
+  '��' => '麻',
+  '��' => '傢',
+  '��' => '傍',
+  '��' => '傅',
+  '��' => '備',
+  '��' => '傑',
+  '��' => '傀',
+  '��' => '傖',
+  '��' => '傘',
+  '��' => '傚',
+  '��' => '最',
+  '��' => '凱',
+  '��' => '割',
+  '��' => '剴',
+  '��' => '創',
+  '��' => '剩',
+  '��' => '勞',
+  '��' => '勝',
+  '��' => '勛',
+  '��' => '博',
+  '��' => '厥',
+  '��' => '啻',
+  '��' => '喀',
+  '��' => '喧',
+  '��' => '啼',
+  '��' => '喊',
+  '��' => '喝',
+  '��' => '喘',
+  '��' => '喂',
+  '��' => '喜',
+  '��' => '喪',
+  '��' => '喔',
+  '��' => '喇',
+  '��' => '喋',
+  '��' => '喃',
+  '��' => '喳',
+  '��' => '單',
+  '��' => '喟',
+  '��' => '唾',
+  '��' => '喲',
+  '��' => '喚',
+  '��' => '喻',
+  '��' => '喬',
+  '��' => '喱',
+  '��' => '啾',
+  '��' => '喉',
+  '��' => '喫',
+  '��' => '喙',
+  '��' => '圍',
+  '��' => '堯',
+  '��' => '堪',
+  '��' => '場',
+  '��' => '堤',
+  '��' => '堰',
+  '��' => '報',
+  '��' => '堡',
+  '��' => '堝',
+  '��' => '堠',
+  '��' => '壹',
+  '��' => '壺',
+  '��' => '奠',
+  '�@' => '婷',
+  '�A' => '媚',
+  '�B' => '婿',
+  '�C' => '媒',
+  '�D' => '媛',
+  '�E' => '媧',
+  '�F' => '孳',
+  '�G' => '孱',
+  '�H' => '寒',
+  '�I' => '富',
+  '�J' => '寓',
+  '�K' => '寐',
+  '�L' => '尊',
+  '�M' => '尋',
+  '�N' => '就',
+  '�O' => '嵌',
+  '�P' => '嵐',
+  '�Q' => '崴',
+  '�R' => '嵇',
+  '�S' => '巽',
+  '�T' => '幅',
+  '�U' => '帽',
+  '�V' => '幀',
+  '�W' => '幃',
+  '�X' => '幾',
+  '�Y' => '廊',
+  '�Z' => '廁',
+  '�[' => '廂',
+  '�\\' => '廄',
+  '�]' => '弼',
+  '�^' => '彭',
+  '�_' => '復',
+  '�`' => '循',
+  '�a' => '徨',
+  '�b' => '惑',
+  '�c' => '惡',
+  '�d' => '悲',
+  '�e' => '悶',
+  '�f' => '惠',
+  '�g' => '愜',
+  '�h' => '愣',
+  '�i' => '惺',
+  '�j' => '愕',
+  '�k' => '惰',
+  '�l' => '惻',
+  '�m' => '惴',
+  '�n' => '慨',
+  '�o' => '惱',
+  '�p' => '愎',
+  '�q' => '惶',
+  '�r' => '愉',
+  '�s' => '愀',
+  '�t' => '愒',
+  '�u' => '戟',
+  '�v' => '扉',
+  '�w' => '掣',
+  '�x' => '掌',
+  '�y' => '描',
+  '�z' => '揀',
+  '�{' => '揩',
+  '�|' => '揉',
+  '�}' => '揆',
+  '�~' => '揍',
+  '��' => '插',
+  '��' => '揣',
+  '��' => '提',
+  '��' => '握',
+  '��' => '揖',
+  '��' => '揭',
+  '��' => '揮',
+  '��' => '捶',
+  '��' => '援',
+  '��' => '揪',
+  '��' => '換',
+  '��' => '摒',
+  '��' => '揚',
+  '��' => '揹',
+  '��' => '敞',
+  '��' => '敦',
+  '��' => '敢',
+  '��' => '散',
+  '��' => '斑',
+  '��' => '斐',
+  '��' => '斯',
+  '��' => '普',
+  '��' => '晰',
+  '��' => '晴',
+  '��' => '晶',
+  '��' => '景',
+  '��' => '暑',
+  '��' => '智',
+  '��' => '晾',
+  '��' => '晷',
+  '��' => '曾',
+  '��' => '替',
+  '��' => '期',
+  '��' => '朝',
+  '��' => '棺',
+  '��' => '棕',
+  '��' => '棠',
+  '��' => '棘',
+  '��' => '棗',
+  '��' => '椅',
+  '��' => '棟',
+  '��' => '棵',
+  '��' => '森',
+  '��' => '棧',
+  '��' => '棹',
+  '��' => '棒',
+  '��' => '棲',
+  '��' => '棣',
+  '��' => '棋',
+  '��' => '棍',
+  '��' => '植',
+  '��' => '椒',
+  '��' => '椎',
+  '��' => '棉',
+  '��' => '棚',
+  '��' => '楮',
+  '��' => '棻',
+  '��' => '款',
+  '��' => '欺',
+  '��' => '欽',
+  '��' => '殘',
+  '��' => '殖',
+  '��' => '殼',
+  '��' => '毯',
+  '��' => '氮',
+  '��' => '氯',
+  '��' => '氬',
+  '��' => '港',
+  '��' => '游',
+  '��' => '湔',
+  '��' => '渡',
+  '��' => '渲',
+  '��' => '湧',
+  '��' => '湊',
+  '��' => '渠',
+  '��' => '渥',
+  '��' => '渣',
+  '��' => '減',
+  '��' => '湛',
+  '��' => '湘',
+  '��' => '渤',
+  '��' => '湖',
+  '��' => '湮',
+  '��' => '渭',
+  '��' => '渦',
+  '��' => '湯',
+  '��' => '渴',
+  '��' => '湍',
+  '��' => '渺',
+  '��' => '測',
+  '��' => '湃',
+  '��' => '渝',
+  '��' => '渾',
+  '��' => '滋',
+  '�@' => '溉',
+  '�A' => '渙',
+  '�B' => '湎',
+  '�C' => '湣',
+  '�D' => '湄',
+  '�E' => '湲',
+  '�F' => '湩',
+  '�G' => '湟',
+  '�H' => '焙',
+  '�I' => '焚',
+  '�J' => '焦',
+  '�K' => '焰',
+  '�L' => '無',
+  '�M' => '然',
+  '�N' => '煮',
+  '�O' => '焜',
+  '�P' => '牌',
+  '�Q' => '犄',
+  '�R' => '犀',
+  '�S' => '猶',
+  '�T' => '猥',
+  '�U' => '猴',
+  '�V' => '猩',
+  '�W' => '琺',
+  '�X' => '琪',
+  '�Y' => '琳',
+  '�Z' => '琢',
+  '�[' => '琥',
+  '�\\' => '琵',
+  '�]' => '琶',
+  '�^' => '琴',
+  '�_' => '琯',
+  '�`' => '琛',
+  '�a' => '琦',
+  '�b' => '琨',
+  '�c' => '甥',
+  '�d' => '甦',
+  '�e' => '畫',
+  '�f' => '番',
+  '�g' => '痢',
+  '�h' => '痛',
+  '�i' => '痣',
+  '�j' => '痙',
+  '�k' => '痘',
+  '�l' => '痞',
+  '�m' => '痠',
+  '�n' => '登',
+  '�o' => '發',
+  '�p' => '皖',
+  '�q' => '皓',
+  '�r' => '皴',
+  '�s' => '盜',
+  '�t' => '睏',
+  '�u' => '短',
+  '�v' => '硝',
+  '�w' => '硬',
+  '�x' => '硯',
+  '�y' => '稍',
+  '�z' => '稈',
+  '�{' => '程',
+  '�|' => '稅',
+  '�}' => '稀',
+  '�~' => '窘',
+  '��' => '窗',
+  '��' => '窖',
+  '��' => '童',
+  '��' => '竣',
+  '��' => '等',
+  '��' => '策',
+  '��' => '筆',
+  '��' => '筐',
+  '��' => '筒',
+  '��' => '答',
+  '��' => '筍',
+  '��' => '筋',
+  '��' => '筏',
+  '��' => '筑',
+  '��' => '粟',
+  '��' => '粥',
+  '��' => '絞',
+  '��' => '結',
+  '��' => '絨',
+  '��' => '絕',
+  '��' => '紫',
+  '��' => '絮',
+  '��' => '絲',
+  '��' => '絡',
+  '��' => '給',
+  '��' => '絢',
+  '��' => '絰',
+  '��' => '絳',
+  '��' => '善',
+  '��' => '翔',
+  '��' => '翕',
+  '��' => '耋',
+  '��' => '聒',
+  '��' => '肅',
+  '��' => '腕',
+  '��' => '腔',
+  '��' => '腋',
+  '��' => '腑',
+  '��' => '腎',
+  '��' => '脹',
+  '��' => '腆',
+  '��' => '脾',
+  '��' => '腌',
+  '��' => '腓',
+  '��' => '腴',
+  '��' => '舒',
+  '��' => '舜',
+  '��' => '菩',
+  '��' => '萃',
+  '��' => '菸',
+  '��' => '萍',
+  '��' => '菠',
+  '��' => '菅',
+  '��' => '萋',
+  '��' => '菁',
+  '��' => '華',
+  '��' => '菱',
+  '��' => '菴',
+  '��' => '著',
+  '��' => '萊',
+  '��' => '菰',
+  '��' => '萌',
+  '��' => '菌',
+  '��' => '菽',
+  '��' => '菲',
+  '��' => '菊',
+  '��' => '萸',
+  '��' => '萎',
+  '��' => '萄',
+  '��' => '菜',
+  '��' => '萇',
+  '��' => '菔',
+  '��' => '菟',
+  '��' => '虛',
+  '��' => '蛟',
+  '��' => '蛙',
+  '��' => '蛭',
+  '��' => '蛔',
+  '��' => '蛛',
+  '��' => '蛤',
+  '��' => '蛐',
+  '��' => '蛞',
+  '��' => '街',
+  '��' => '裁',
+  '��' => '裂',
+  '��' => '袱',
+  '��' => '覃',
+  '��' => '視',
+  '��' => '註',
+  '��' => '詠',
+  '��' => '評',
+  '��' => '詞',
+  '��' => '証',
+  '��' => '詁',
+  '�@' => '詔',
+  '�A' => '詛',
+  '�B' => '詐',
+  '�C' => '詆',
+  '�D' => '訴',
+  '�E' => '診',
+  '�F' => '訶',
+  '�G' => '詖',
+  '�H' => '象',
+  '�I' => '貂',
+  '�J' => '貯',
+  '�K' => '貼',
+  '�L' => '貳',
+  '�M' => '貽',
+  '�N' => '賁',
+  '�O' => '費',
+  '�P' => '賀',
+  '�Q' => '貴',
+  '�R' => '買',
+  '�S' => '貶',
+  '�T' => '貿',
+  '�U' => '貸',
+  '�V' => '越',
+  '�W' => '超',
+  '�X' => '趁',
+  '�Y' => '跎',
+  '�Z' => '距',
+  '�[' => '跋',
+  '�\\' => '跚',
+  '�]' => '跑',
+  '�^' => '跌',
+  '�_' => '跛',
+  '�`' => '跆',
+  '�a' => '軻',
+  '�b' => '軸',
+  '�c' => '軼',
+  '�d' => '辜',
+  '�e' => '逮',
+  '�f' => '逵',
+  '�g' => '週',
+  '�h' => '逸',
+  '�i' => '進',
+  '�j' => '逶',
+  '�k' => '鄂',
+  '�l' => '郵',
+  '�m' => '鄉',
+  '�n' => '郾',
+  '�o' => '酣',
+  '�p' => '酥',
+  '�q' => '量',
+  '�r' => '鈔',
+  '�s' => '鈕',
+  '�t' => '鈣',
+  '�u' => '鈉',
+  '�v' => '鈞',
+  '�w' => '鈍',
+  '�x' => '鈐',
+  '�y' => '鈇',
+  '�z' => '鈑',
+  '�{' => '閔',
+  '�|' => '閏',
+  '�}' => '開',
+  '�~' => '閑',
+  '��' => '間',
+  '��' => '閒',
+  '��' => '閎',
+  '��' => '隊',
+  '��' => '階',
+  '��' => '隋',
+  '��' => '陽',
+  '��' => '隅',
+  '��' => '隆',
+  '��' => '隍',
+  '��' => '陲',
+  '��' => '隄',
+  '��' => '雁',
+  '��' => '雅',
+  '��' => '雄',
+  '��' => '集',
+  '��' => '雇',
+  '��' => '雯',
+  '��' => '雲',
+  '��' => '韌',
+  '��' => '項',
+  '��' => '順',
+  '��' => '須',
+  '��' => '飧',
+  '��' => '飪',
+  '��' => '飯',
+  '��' => '飩',
+  '��' => '飲',
+  '��' => '飭',
+  '��' => '馮',
+  '��' => '馭',
+  '��' => '黃',
+  '��' => '黍',
+  '��' => '黑',
+  '��' => '亂',
+  '��' => '傭',
+  '��' => '債',
+  '��' => '傲',
+  '��' => '傳',
+  '��' => '僅',
+  '��' => '傾',
+  '��' => '催',
+  '��' => '傷',
+  '��' => '傻',
+  '��' => '傯',
+  '��' => '僇',
+  '��' => '剿',
+  '��' => '剷',
+  '��' => '剽',
+  '��' => '募',
+  '��' => '勦',
+  '��' => '勤',
+  '��' => '勢',
+  '��' => '勣',
+  '��' => '匯',
+  '��' => '嗟',
+  '��' => '嗨',
+  '��' => '嗓',
+  '��' => '嗦',
+  '��' => '嗎',
+  '��' => '嗜',
+  '��' => '嗇',
+  '��' => '嗑',
+  '��' => '嗣',
+  '��' => '嗤',
+  '��' => '嗯',
+  '��' => '嗚',
+  '��' => '嗡',
+  '��' => '嗅',
+  '��' => '嗆',
+  '��' => '嗥',
+  '��' => '嗉',
+  '��' => '園',
+  '��' => '圓',
+  '��' => '塞',
+  '��' => '塑',
+  '��' => '塘',
+  '��' => '塗',
+  '��' => '塚',
+  '��' => '塔',
+  '��' => '填',
+  '��' => '塌',
+  '��' => '塭',
+  '��' => '塊',
+  '��' => '塢',
+  '��' => '塒',
+  '��' => '塋',
+  '��' => '奧',
+  '��' => '嫁',
+  '��' => '嫉',
+  '��' => '嫌',
+  '��' => '媾',
+  '��' => '媽',
+  '��' => '媼',
+  '�@' => '媳',
+  '�A' => '嫂',
+  '�B' => '媲',
+  '�C' => '嵩',
+  '�D' => '嵯',
+  '�E' => '幌',
+  '�F' => '幹',
+  '�G' => '廉',
+  '�H' => '廈',
+  '�I' => '弒',
+  '�J' => '彙',
+  '�K' => '徬',
+  '�L' => '微',
+  '�M' => '愚',
+  '�N' => '意',
+  '�O' => '慈',
+  '�P' => '感',
+  '�Q' => '想',
+  '�R' => '愛',
+  '�S' => '惹',
+  '�T' => '愁',
+  '�U' => '愈',
+  '�V' => '慎',
+  '�W' => '慌',
+  '�X' => '慄',
+  '�Y' => '慍',
+  '�Z' => '愾',
+  '�[' => '愴',
+  '�\\' => '愧',
+  '�]' => '愍',
+  '�^' => '愆',
+  '�_' => '愷',
+  '�`' => '戡',
+  '�a' => '戢',
+  '�b' => '搓',
+  '�c' => '搾',
+  '�d' => '搞',
+  '�e' => '搪',
+  '�f' => '搭',
+  '�g' => '搽',
+  '�h' => '搬',
+  '�i' => '搏',
+  '�j' => '搜',
+  '�k' => '搔',
+  '�l' => '損',
+  '�m' => '搶',
+  '�n' => '搖',
+  '�o' => '搗',
+  '�p' => '搆',
+  '�q' => '敬',
+  '�r' => '斟',
+  '�s' => '新',
+  '�t' => '暗',
+  '�u' => '暉',
+  '�v' => '暇',
+  '�w' => '暈',
+  '�x' => '暖',
+  '�y' => '暄',
+  '�z' => '暘',
+  '�{' => '暍',
+  '�|' => '會',
+  '�}' => '榔',
+  '�~' => '業',
+  '��' => '楚',
+  '��' => '楷',
+  '��' => '楠',
+  '��' => '楔',
+  '��' => '極',
+  '��' => '椰',
+  '��' => '概',
+  '��' => '楊',
+  '��' => '楨',
+  '��' => '楫',
+  '��' => '楞',
+  '��' => '楓',
+  '��' => '楹',
+  '��' => '榆',
+  '��' => '楝',
+  '��' => '楣',
+  '��' => '楛',
+  '��' => '歇',
+  '��' => '歲',
+  '��' => '毀',
+  '��' => '殿',
+  '��' => '毓',
+  '��' => '毽',
+  '��' => '溢',
+  '��' => '溯',
+  '��' => '滓',
+  '��' => '溶',
+  '��' => '滂',
+  '��' => '源',
+  '��' => '溝',
+  '��' => '滇',
+  '��' => '滅',
+  '��' => '溥',
+  '��' => '溘',
+  '��' => '溼',
+  '��' => '溺',
+  '��' => '溫',
+  '��' => '滑',
+  '��' => '準',
+  '��' => '溜',
+  '��' => '滄',
+  '��' => '滔',
+  '��' => '溪',
+  '��' => '溧',
+  '��' => '溴',
+  '��' => '煎',
+  '��' => '煙',
+  '��' => '煩',
+  '��' => '煤',
+  '��' => '煉',
+  '��' => '照',
+  '��' => '煜',
+  '��' => '煬',
+  '��' => '煦',
+  '��' => '煌',
+  '��' => '煥',
+  '��' => '煞',
+  '��' => '煆',
+  '��' => '煨',
+  '��' => '煖',
+  '��' => '爺',
+  '��' => '牒',
+  '��' => '猷',
+  '��' => '獅',
+  '��' => '猿',
+  '��' => '猾',
+  '��' => '瑯',
+  '��' => '瑚',
+  '��' => '瑕',
+  '��' => '瑟',
+  '��' => '瑞',
+  '��' => '瑁',
+  '��' => '琿',
+  '��' => '瑙',
+  '��' => '瑛',
+  '��' => '瑜',
+  '��' => '當',
+  '��' => '畸',
+  '��' => '瘀',
+  '��' => '痰',
+  '��' => '瘁',
+  '��' => '痲',
+  '��' => '痱',
+  '��' => '痺',
+  '��' => '痿',
+  '��' => '痴',
+  '��' => '痳',
+  '��' => '盞',
+  '��' => '盟',
+  '��' => '睛',
+  '��' => '睫',
+  '��' => '睦',
+  '��' => '睞',
+  '��' => '督',
+  '�@' => '睹',
+  '�A' => '睪',
+  '�B' => '睬',
+  '�C' => '睜',
+  '�D' => '睥',
+  '�E' => '睨',
+  '�F' => '睢',
+  '�G' => '矮',
+  '�H' => '碎',
+  '�I' => '碰',
+  '�J' => '碗',
+  '�K' => '碘',
+  '�L' => '碌',
+  '�M' => '碉',
+  '�N' => '硼',
+  '�O' => '碑',
+  '�P' => '碓',
+  '�Q' => '硿',
+  '�R' => '祺',
+  '�S' => '祿',
+  '�T' => '禁',
+  '�U' => '萬',
+  '�V' => '禽',
+  '�W' => '稜',
+  '�X' => '稚',
+  '�Y' => '稠',
+  '�Z' => '稔',
+  '�[' => '稟',
+  '�\\' => '稞',
+  '�]' => '窟',
+  '�^' => '窠',
+  '�_' => '筷',
+  '�`' => '節',
+  '�a' => '筠',
+  '�b' => '筮',
+  '�c' => '筧',
+  '�d' => '粱',
+  '�e' => '粳',
+  '�f' => '粵',
+  '�g' => '經',
+  '�h' => '絹',
+  '�i' => '綑',
+  '�j' => '綁',
+  '�k' => '綏',
+  '�l' => '絛',
+  '�m' => '置',
+  '�n' => '罩',
+  '�o' => '罪',
+  '�p' => '署',
+  '�q' => '義',
+  '�r' => '羨',
+  '�s' => '群',
+  '�t' => '聖',
+  '�u' => '聘',
+  '�v' => '肆',
+  '�w' => '肄',
+  '�x' => '腱',
+  '�y' => '腰',
+  '�z' => '腸',
+  '�{' => '腥',
+  '�|' => '腮',
+  '�}' => '腳',
+  '�~' => '腫',
+  '��' => '腹',
+  '��' => '腺',
+  '��' => '腦',
+  '��' => '舅',
+  '��' => '艇',
+  '��' => '蒂',
+  '��' => '葷',
+  '��' => '落',
+  '��' => '萱',
+  '��' => '葵',
+  '��' => '葦',
+  '��' => '葫',
+  '��' => '葉',
+  '��' => '葬',
+  '��' => '葛',
+  '��' => '萼',
+  '��' => '萵',
+  '��' => '葡',
+  '��' => '董',
+  '��' => '葩',
+  '��' => '葭',
+  '��' => '葆',
+  '��' => '虞',
+  '��' => '虜',
+  '��' => '號',
+  '��' => '蛹',
+  '��' => '蜓',
+  '��' => '蜈',
+  '��' => '蜇',
+  '��' => '蜀',
+  '��' => '蛾',
+  '��' => '蛻',
+  '��' => '蜂',
+  '��' => '蜃',
+  '��' => '蜆',
+  '��' => '蜊',
+  '��' => '衙',
+  '��' => '裟',
+  '��' => '裔',
+  '��' => '裙',
+  '��' => '補',
+  '��' => '裘',
+  '��' => '裝',
+  '��' => '裡',
+  '��' => '裊',
+  '��' => '裕',
+  '��' => '裒',
+  '��' => '覜',
+  '��' => '解',
+  '��' => '詫',
+  '��' => '該',
+  '��' => '詳',
+  '��' => '試',
+  '��' => '詩',
+  '��' => '詰',
+  '��' => '誇',
+  '��' => '詼',
+  '��' => '詣',
+  '��' => '誠',
+  '��' => '話',
+  '��' => '誅',
+  '��' => '詭',
+  '��' => '詢',
+  '��' => '詮',
+  '��' => '詬',
+  '��' => '詹',
+  '��' => '詻',
+  '��' => '訾',
+  '��' => '詨',
+  '��' => '豢',
+  '��' => '貊',
+  '��' => '貉',
+  '��' => '賊',
+  '��' => '資',
+  '��' => '賈',
+  '��' => '賄',
+  '��' => '貲',
+  '��' => '賃',
+  '��' => '賂',
+  '��' => '賅',
+  '��' => '跡',
+  '��' => '跟',
+  '��' => '跨',
+  '��' => '路',
+  '��' => '跳',
+  '��' => '跺',
+  '��' => '跪',
+  '��' => '跤',
+  '��' => '跦',
+  '��' => '躲',
+  '��' => '較',
+  '��' => '載',
+  '��' => '軾',
+  '��' => '輊',
+  '�@' => '辟',
+  '�A' => '農',
+  '�B' => '運',
+  '�C' => '遊',
+  '�D' => '道',
+  '�E' => '遂',
+  '�F' => '達',
+  '�G' => '逼',
+  '�H' => '違',
+  '�I' => '遐',
+  '�J' => '遇',
+  '�K' => '遏',
+  '�L' => '過',
+  '�M' => '遍',
+  '�N' => '遑',
+  '�O' => '逾',
+  '�P' => '遁',
+  '�Q' => '鄒',
+  '�R' => '鄗',
+  '�S' => '酬',
+  '�T' => '酪',
+  '�U' => '酩',
+  '�V' => '釉',
+  '�W' => '鈷',
+  '�X' => '鉗',
+  '�Y' => '鈸',
+  '�Z' => '鈽',
+  '�[' => '鉀',
+  '�\\' => '鈾',
+  '�]' => '鉛',
+  '�^' => '鉋',
+  '�_' => '鉤',
+  '�`' => '鉑',
+  '�a' => '鈴',
+  '�b' => '鉉',
+  '�c' => '鉍',
+  '�d' => '鉅',
+  '�e' => '鈹',
+  '�f' => '鈿',
+  '�g' => '鉚',
+  '�h' => '閘',
+  '�i' => '隘',
+  '�j' => '隔',
+  '�k' => '隕',
+  '�l' => '雍',
+  '�m' => '雋',
+  '�n' => '雉',
+  '�o' => '雊',
+  '�p' => '雷',
+  '�q' => '電',
+  '�r' => '雹',
+  '�s' => '零',
+  '�t' => '靖',
+  '�u' => '靴',
+  '�v' => '靶',
+  '�w' => '預',
+  '�x' => '頑',
+  '�y' => '頓',
+  '�z' => '頊',
+  '�{' => '頒',
+  '�|' => '頌',
+  '�}' => '飼',
+  '�~' => '飴',
+  '��' => '飽',
+  '��' => '飾',
+  '��' => '馳',
+  '��' => '馱',
+  '��' => '馴',
+  '��' => '髡',
+  '��' => '鳩',
+  '��' => '麂',
+  '��' => '鼎',
+  '��' => '鼓',
+  '��' => '鼠',
+  '��' => '僧',
+  '��' => '僮',
+  '��' => '僥',
+  '��' => '僖',
+  '��' => '僭',
+  '��' => '僚',
+  '��' => '僕',
+  '��' => '像',
+  '��' => '僑',
+  '��' => '僱',
+  '��' => '僎',
+  '��' => '僩',
+  '��' => '兢',
+  '��' => '凳',
+  '��' => '劃',
+  '��' => '劂',
+  '��' => '匱',
+  '��' => '厭',
+  '��' => '嗾',
+  '��' => '嘀',
+  '��' => '嘛',
+  '��' => '嘗',
+  '��' => '嗽',
+  '��' => '嘔',
+  '��' => '嘆',
+  '��' => '嘉',
+  '��' => '嘍',
+  '��' => '嘎',
+  '��' => '嗷',
+  '��' => '嘖',
+  '��' => '嘟',
+  '��' => '嘈',
+  '��' => '嘐',
+  '��' => '嗶',
+  '��' => '團',
+  '��' => '圖',
+  '��' => '塵',
+  '��' => '塾',
+  '��' => '境',
+  '��' => '墓',
+  '��' => '墊',
+  '��' => '塹',
+  '��' => '墅',
+  '��' => '塽',
+  '��' => '壽',
+  '��' => '夥',
+  '��' => '夢',
+  '��' => '夤',
+  '��' => '奪',
+  '��' => '奩',
+  '��' => '嫡',
+  '��' => '嫦',
+  '��' => '嫩',
+  '��' => '嫗',
+  '��' => '嫖',
+  '��' => '嫘',
+  '��' => '嫣',
+  '��' => '孵',
+  '��' => '寞',
+  '��' => '寧',
+  '��' => '寡',
+  '��' => '寥',
+  '��' => '實',
+  '��' => '寨',
+  '��' => '寢',
+  '��' => '寤',
+  '��' => '察',
+  '��' => '對',
+  '��' => '屢',
+  '��' => '嶄',
+  '��' => '嶇',
+  '��' => '幛',
+  '��' => '幣',
+  '��' => '幕',
+  '��' => '幗',
+  '��' => '幔',
+  '��' => '廓',
+  '��' => '廖',
+  '��' => '弊',
+  '��' => '彆',
+  '��' => '彰',
+  '��' => '徹',
+  '��' => '慇',
+  '�@' => '愿',
+  '�A' => '態',
+  '�B' => '慷',
+  '�C' => '慢',
+  '�D' => '慣',
+  '�E' => '慟',
+  '�F' => '慚',
+  '�G' => '慘',
+  '�H' => '慵',
+  '�I' => '截',
+  '�J' => '撇',
+  '�K' => '摘',
+  '�L' => '摔',
+  '�M' => '撤',
+  '�N' => '摸',
+  '�O' => '摟',
+  '�P' => '摺',
+  '�Q' => '摑',
+  '�R' => '摧',
+  '�S' => '搴',
+  '�T' => '摭',
+  '�U' => '摻',
+  '�V' => '敲',
+  '�W' => '斡',
+  '�X' => '旗',
+  '�Y' => '旖',
+  '�Z' => '暢',
+  '�[' => '暨',
+  '�\\' => '暝',
+  '�]' => '榜',
+  '�^' => '榨',
+  '�_' => '榕',
+  '�`' => '槁',
+  '�a' => '榮',
+  '�b' => '槓',
+  '�c' => '構',
+  '�d' => '榛',
+  '�e' => '榷',
+  '�f' => '榻',
+  '�g' => '榫',
+  '�h' => '榴',
+  '�i' => '槐',
+  '�j' => '槍',
+  '�k' => '榭',
+  '�l' => '槌',
+  '�m' => '榦',
+  '�n' => '槃',
+  '�o' => '榣',
+  '�p' => '歉',
+  '�q' => '歌',
+  '�r' => '氳',
+  '�s' => '漳',
+  '�t' => '演',
+  '�u' => '滾',
+  '�v' => '漓',
+  '�w' => '滴',
+  '�x' => '漩',
+  '�y' => '漾',
+  '�z' => '漠',
+  '�{' => '漬',
+  '�|' => '漏',
+  '�}' => '漂',
+  '�~' => '漢',
+  '��' => '滿',
+  '��' => '滯',
+  '��' => '漆',
+  '��' => '漱',
+  '��' => '漸',
+  '��' => '漲',
+  '��' => '漣',
+  '��' => '漕',
+  '��' => '漫',
+  '��' => '漯',
+  '��' => '澈',
+  '��' => '漪',
+  '��' => '滬',
+  '��' => '漁',
+  '��' => '滲',
+  '��' => '滌',
+  '��' => '滷',
+  '��' => '熔',
+  '��' => '熙',
+  '��' => '煽',
+  '��' => '熊',
+  '��' => '熄',
+  '��' => '熒',
+  '��' => '爾',
+  '��' => '犒',
+  '��' => '犖',
+  '��' => '獄',
+  '��' => '獐',
+  '��' => '瑤',
+  '��' => '瑣',
+  '��' => '瑪',
+  '��' => '瑰',
+  '��' => '瑭',
+  '��' => '甄',
+  '��' => '疑',
+  '��' => '瘧',
+  '��' => '瘍',
+  '��' => '瘋',
+  '��' => '瘉',
+  '��' => '瘓',
+  '��' => '盡',
+  '��' => '監',
+  '��' => '瞄',
+  '��' => '睽',
+  '��' => '睿',
+  '��' => '睡',
+  '��' => '磁',
+  '��' => '碟',
+  '��' => '碧',
+  '��' => '碳',
+  '��' => '碩',
+  '��' => '碣',
+  '��' => '禎',
+  '��' => '福',
+  '��' => '禍',
+  '��' => '種',
+  '��' => '稱',
+  '��' => '窪',
+  '��' => '窩',
+  '��' => '竭',
+  '��' => '端',
+  '��' => '管',
+  '��' => '箕',
+  '��' => '箋',
+  '��' => '筵',
+  '��' => '算',
+  '��' => '箝',
+  '��' => '箔',
+  '��' => '箏',
+  '��' => '箸',
+  '��' => '箇',
+  '��' => '箄',
+  '��' => '粹',
+  '��' => '粽',
+  '��' => '精',
+  '��' => '綻',
+  '��' => '綰',
+  '��' => '綜',
+  '��' => '綽',
+  '��' => '綾',
+  '��' => '綠',
+  '��' => '緊',
+  '��' => '綴',
+  '��' => '網',
+  '��' => '綱',
+  '��' => '綺',
+  '��' => '綢',
+  '��' => '綿',
+  '��' => '綵',
+  '��' => '綸',
+  '��' => '維',
+  '��' => '緒',
+  '��' => '緇',
+  '��' => '綬',
+  '�@' => '罰',
+  '�A' => '翠',
+  '�B' => '翡',
+  '�C' => '翟',
+  '�D' => '聞',
+  '�E' => '聚',
+  '�F' => '肇',
+  '�G' => '腐',
+  '�H' => '膀',
+  '�I' => '膏',
+  '�J' => '膈',
+  '�K' => '膊',
+  '�L' => '腿',
+  '�M' => '膂',
+  '�N' => '臧',
+  '�O' => '臺',
+  '�P' => '與',
+  '�Q' => '舔',
+  '�R' => '舞',
+  '�S' => '艋',
+  '�T' => '蓉',
+  '�U' => '蒿',
+  '�V' => '蓆',
+  '�W' => '蓄',
+  '�X' => '蒙',
+  '�Y' => '蒞',
+  '�Z' => '蒲',
+  '�[' => '蒜',
+  '�\\' => '蓋',
+  '�]' => '蒸',
+  '�^' => '蓀',
+  '�_' => '蓓',
+  '�`' => '蒐',
+  '�a' => '蒼',
+  '�b' => '蓑',
+  '�c' => '蓊',
+  '�d' => '蜿',
+  '�e' => '蜜',
+  '�f' => '蜻',
+  '�g' => '蜢',
+  '�h' => '蜥',
+  '�i' => '蜴',
+  '�j' => '蜘',
+  '�k' => '蝕',
+  '�l' => '蜷',
+  '�m' => '蜩',
+  '�n' => '裳',
+  '�o' => '褂',
+  '�p' => '裴',
+  '�q' => '裹',
+  '�r' => '裸',
+  '�s' => '製',
+  '�t' => '裨',
+  '�u' => '褚',
+  '�v' => '裯',
+  '�w' => '誦',
+  '�x' => '誌',
+  '�y' => '語',
+  '�z' => '誣',
+  '�{' => '認',
+  '�|' => '誡',
+  '�}' => '誓',
+  '�~' => '誤',
+  '��' => '說',
+  '��' => '誥',
+  '��' => '誨',
+  '��' => '誘',
+  '��' => '誑',
+  '��' => '誚',
+  '��' => '誧',
+  '��' => '豪',
+  '��' => '貍',
+  '��' => '貌',
+  '��' => '賓',
+  '��' => '賑',
+  '��' => '賒',
+  '��' => '赫',
+  '��' => '趙',
+  '��' => '趕',
+  '��' => '跼',
+  '��' => '輔',
+  '��' => '輒',
+  '��' => '輕',
+  '��' => '輓',
+  '��' => '辣',
+  '��' => '遠',
+  '��' => '遘',
+  '��' => '遜',
+  '��' => '遣',
+  '��' => '遙',
+  '��' => '遞',
+  '��' => '遢',
+  '��' => '遝',
+  '��' => '遛',
+  '��' => '鄙',
+  '��' => '鄘',
+  '��' => '鄞',
+  '��' => '酵',
+  '��' => '酸',
+  '��' => '酷',
+  '��' => '酴',
+  '��' => '鉸',
+  '��' => '銀',
+  '��' => '銅',
+  '��' => '銘',
+  '��' => '銖',
+  '��' => '鉻',
+  '��' => '銓',
+  '��' => '銜',
+  '��' => '銨',
+  '��' => '鉼',
+  '��' => '銑',
+  '��' => '閡',
+  '��' => '閨',
+  '��' => '閩',
+  '��' => '閣',
+  '��' => '閥',
+  '��' => '閤',
+  '��' => '隙',
+  '��' => '障',
+  '��' => '際',
+  '��' => '雌',
+  '��' => '雒',
+  '��' => '需',
+  '��' => '靼',
+  '��' => '鞅',
+  '��' => '韶',
+  '��' => '頗',
+  '��' => '領',
+  '��' => '颯',
+  '��' => '颱',
+  '��' => '餃',
+  '��' => '餅',
+  '��' => '餌',
+  '��' => '餉',
+  '��' => '駁',
+  '��' => '骯',
+  '��' => '骰',
+  '��' => '髦',
+  '��' => '魁',
+  '��' => '魂',
+  '��' => '鳴',
+  '��' => '鳶',
+  '��' => '鳳',
+  '��' => '麼',
+  '��' => '鼻',
+  '��' => '齊',
+  '��' => '億',
+  '��' => '儀',
+  '��' => '僻',
+  '��' => '僵',
+  '��' => '價',
+  '��' => '儂',
+  '��' => '儈',
+  '��' => '儉',
+  '��' => '儅',
+  '��' => '凜',
+  '�@' => '劇',
+  '�A' => '劈',
+  '�B' => '劉',
+  '�C' => '劍',
+  '�D' => '劊',
+  '�E' => '勰',
+  '�F' => '厲',
+  '�G' => '嘮',
+  '�H' => '嘻',
+  '�I' => '嘹',
+  '�J' => '嘲',
+  '�K' => '嘿',
+  '�L' => '嘴',
+  '�M' => '嘩',
+  '�N' => '噓',
+  '�O' => '噎',
+  '�P' => '噗',
+  '�Q' => '噴',
+  '�R' => '嘶',
+  '�S' => '嘯',
+  '�T' => '嘰',
+  '�U' => '墀',
+  '�V' => '墟',
+  '�W' => '增',
+  '�X' => '墳',
+  '�Y' => '墜',
+  '�Z' => '墮',
+  '�[' => '墩',
+  '�\\' => '墦',
+  '�]' => '奭',
+  '�^' => '嬉',
+  '�_' => '嫻',
+  '�`' => '嬋',
+  '�a' => '嫵',
+  '�b' => '嬌',
+  '�c' => '嬈',
+  '�d' => '寮',
+  '�e' => '寬',
+  '�f' => '審',
+  '�g' => '寫',
+  '�h' => '層',
+  '�i' => '履',
+  '�j' => '嶝',
+  '�k' => '嶔',
+  '�l' => '幢',
+  '�m' => '幟',
+  '�n' => '幡',
+  '�o' => '廢',
+  '�p' => '廚',
+  '�q' => '廟',
+  '�r' => '廝',
+  '�s' => '廣',
+  '�t' => '廠',
+  '�u' => '彈',
+  '�v' => '影',
+  '�w' => '德',
+  '�x' => '徵',
+  '�y' => '慶',
+  '�z' => '慧',
+  '�{' => '慮',
+  '�|' => '慝',
+  '�}' => '慕',
+  '�~' => '憂',
+  '��' => '慼',
+  '��' => '慰',
+  '��' => '慫',
+  '��' => '慾',
+  '��' => '憧',
+  '��' => '憐',
+  '��' => '憫',
+  '��' => '憎',
+  '��' => '憬',
+  '��' => '憚',
+  '��' => '憤',
+  '��' => '憔',
+  '��' => '憮',
+  '��' => '戮',
+  '��' => '摩',
+  '��' => '摯',
+  '��' => '摹',
+  '��' => '撞',
+  '��' => '撲',
+  '��' => '撈',
+  '��' => '撐',
+  '��' => '撰',
+  '��' => '撥',
+  '��' => '撓',
+  '��' => '撕',
+  '��' => '撩',
+  '��' => '撒',
+  '��' => '撮',
+  '��' => '播',
+  '��' => '撫',
+  '��' => '撚',
+  '��' => '撬',
+  '��' => '撙',
+  '��' => '撢',
+  '��' => '撳',
+  '��' => '敵',
+  '��' => '敷',
+  '��' => '數',
+  '��' => '暮',
+  '��' => '暫',
+  '��' => '暴',
+  '��' => '暱',
+  '��' => '樣',
+  '��' => '樟',
+  '��' => '槨',
+  '��' => '樁',
+  '��' => '樞',
+  '��' => '標',
+  '��' => '槽',
+  '��' => '模',
+  '��' => '樓',
+  '��' => '樊',
+  '��' => '槳',
+  '��' => '樂',
+  '��' => '樅',
+  '��' => '槭',
+  '��' => '樑',
+  '��' => '歐',
+  '��' => '歎',
+  '��' => '殤',
+  '��' => '毅',
+  '��' => '毆',
+  '��' => '漿',
+  '��' => '潼',
+  '��' => '澄',
+  '��' => '潑',
+  '��' => '潦',
+  '��' => '潔',
+  '��' => '澆',
+  '��' => '潭',
+  '��' => '潛',
+  '��' => '潸',
+  '��' => '潮',
+  '��' => '澎',
+  '��' => '潺',
+  '��' => '潰',
+  '��' => '潤',
+  '��' => '澗',
+  '��' => '潘',
+  '��' => '滕',
+  '��' => '潯',
+  '��' => '潠',
+  '��' => '潟',
+  '��' => '熟',
+  '��' => '熬',
+  '��' => '熱',
+  '��' => '熨',
+  '��' => '牖',
+  '��' => '犛',
+  '��' => '獎',
+  '��' => '獗',
+  '��' => '瑩',
+  '��' => '璋',
+  '��' => '璃',
+  '�@' => '瑾',
+  '�A' => '璀',
+  '�B' => '畿',
+  '�C' => '瘠',
+  '�D' => '瘩',
+  '�E' => '瘟',
+  '�F' => '瘤',
+  '�G' => '瘦',
+  '�H' => '瘡',
+  '�I' => '瘢',
+  '�J' => '皚',
+  '�K' => '皺',
+  '�L' => '盤',
+  '�M' => '瞎',
+  '�N' => '瞇',
+  '�O' => '瞌',
+  '�P' => '瞑',
+  '�Q' => '瞋',
+  '�R' => '磋',
+  '�S' => '磅',
+  '�T' => '確',
+  '�U' => '磊',
+  '�V' => '碾',
+  '�W' => '磕',
+  '�X' => '碼',
+  '�Y' => '磐',
+  '�Z' => '稿',
+  '�[' => '稼',
+  '�\\' => '穀',
+  '�]' => '稽',
+  '�^' => '稷',
+  '�_' => '稻',
+  '�`' => '窯',
+  '�a' => '窮',
+  '�b' => '箭',
+  '�c' => '箱',
+  '�d' => '範',
+  '�e' => '箴',
+  '�f' => '篆',
+  '�g' => '篇',
+  '�h' => '篁',
+  '�i' => '箠',
+  '�j' => '篌',
+  '�k' => '糊',
+  '�l' => '締',
+  '�m' => '練',
+  '�n' => '緯',
+  '�o' => '緻',
+  '�p' => '緘',
+  '�q' => '緬',
+  '�r' => '緝',
+  '�s' => '編',
+  '�t' => '緣',
+  '�u' => '線',
+  '�v' => '緞',
+  '�w' => '緩',
+  '�x' => '綞',
+  '�y' => '緙',
+  '�z' => '緲',
+  '�{' => '緹',
+  '�|' => '罵',
+  '�}' => '罷',
+  '�~' => '羯',
+  '��' => '翩',
+  '��' => '耦',
+  '��' => '膛',
+  '��' => '膜',
+  '��' => '膝',
+  '��' => '膠',
+  '��' => '膚',
+  '��' => '膘',
+  '��' => '蔗',
+  '��' => '蔽',
+  '��' => '蔚',
+  '��' => '蓮',
+  '��' => '蔬',
+  '��' => '蔭',
+  '��' => '蔓',
+  '��' => '蔑',
+  '��' => '蔣',
+  '��' => '蔡',
+  '��' => '蔔',
+  '��' => '蓬',
+  '��' => '蔥',
+  '��' => '蓿',
+  '��' => '蔆',
+  '��' => '螂',
+  '��' => '蝴',
+  '��' => '蝶',
+  '��' => '蝠',
+  '��' => '蝦',
+  '��' => '蝸',
+  '��' => '蝨',
+  '��' => '蝙',
+  '��' => '蝗',
+  '��' => '蝌',
+  '��' => '蝓',
+  '��' => '衛',
+  '��' => '衝',
+  '��' => '褐',
+  '��' => '複',
+  '��' => '褒',
+  '��' => '褓',
+  '��' => '褕',
+  '��' => '褊',
+  '��' => '誼',
+  '��' => '諒',
+  '��' => '談',
+  '��' => '諄',
+  '��' => '誕',
+  '��' => '請',
+  '��' => '諸',
+  '��' => '課',
+  '��' => '諉',
+  '��' => '諂',
+  '��' => '調',
+  '��' => '誰',
+  '��' => '論',
+  '��' => '諍',
+  '��' => '誶',
+  '��' => '誹',
+  '��' => '諛',
+  '��' => '豌',
+  '��' => '豎',
+  '��' => '豬',
+  '��' => '賠',
+  '��' => '賞',
+  '��' => '賦',
+  '��' => '賤',
+  '��' => '賬',
+  '��' => '賭',
+  '��' => '賢',
+  '��' => '賣',
+  '��' => '賜',
+  '��' => '質',
+  '��' => '賡',
+  '��' => '赭',
+  '��' => '趟',
+  '��' => '趣',
+  '��' => '踫',
+  '��' => '踐',
+  '��' => '踝',
+  '��' => '踢',
+  '��' => '踏',
+  '��' => '踩',
+  '��' => '踟',
+  '��' => '踡',
+  '��' => '踞',
+  '��' => '躺',
+  '��' => '輝',
+  '��' => '輛',
+  '��' => '輟',
+  '��' => '輩',
+  '��' => '輦',
+  '��' => '輪',
+  '��' => '輜',
+  '��' => '輞',
+  '�@' => '輥',
+  '�A' => '適',
+  '�B' => '遮',
+  '�C' => '遨',
+  '�D' => '遭',
+  '�E' => '遷',
+  '�F' => '鄰',
+  '�G' => '鄭',
+  '�H' => '鄧',
+  '�I' => '鄱',
+  '�J' => '醇',
+  '�K' => '醉',
+  '�L' => '醋',
+  '�M' => '醃',
+  '�N' => '鋅',
+  '�O' => '銻',
+  '�P' => '銷',
+  '�Q' => '鋪',
+  '�R' => '銬',
+  '�S' => '鋤',
+  '�T' => '鋁',
+  '�U' => '銳',
+  '�V' => '銼',
+  '�W' => '鋒',
+  '�X' => '鋇',
+  '�Y' => '鋰',
+  '�Z' => '銲',
+  '�[' => '閭',
+  '�\\' => '閱',
+  '�]' => '霄',
+  '�^' => '霆',
+  '�_' => '震',
+  '�`' => '霉',
+  '�a' => '靠',
+  '�b' => '鞍',
+  '�c' => '鞋',
+  '�d' => '鞏',
+  '�e' => '頡',
+  '�f' => '頫',
+  '�g' => '頜',
+  '�h' => '颳',
+  '�i' => '養',
+  '�j' => '餓',
+  '�k' => '餒',
+  '�l' => '餘',
+  '�m' => '駝',
+  '�n' => '駐',
+  '�o' => '駟',
+  '�p' => '駛',
+  '�q' => '駑',
+  '�r' => '駕',
+  '�s' => '駒',
+  '�t' => '駙',
+  '�u' => '骷',
+  '�v' => '髮',
+  '�w' => '髯',
+  '�x' => '鬧',
+  '�y' => '魅',
+  '�z' => '魄',
+  '�{' => '魷',
+  '�|' => '魯',
+  '�}' => '鴆',
+  '�~' => '鴉',
+  '��' => '鴃',
+  '��' => '麩',
+  '��' => '麾',
+  '��' => '黎',
+  '��' => '墨',
+  '��' => '齒',
+  '��' => '儒',
+  '��' => '儘',
+  '��' => '儔',
+  '��' => '儐',
+  '��' => '儕',
+  '��' => '冀',
+  '��' => '冪',
+  '��' => '凝',
+  '��' => '劑',
+  '��' => '劓',
+  '��' => '勳',
+  '��' => '噙',
+  '��' => '噫',
+  '��' => '噹',
+  '��' => '噩',
+  '��' => '噤',
+  '��' => '噸',
+  '��' => '噪',
+  '��' => '器',
+  '��' => '噥',
+  '��' => '噱',
+  '��' => '噯',
+  '��' => '噬',
+  '��' => '噢',
+  '��' => '噶',
+  '��' => '壁',
+  '��' => '墾',
+  '��' => '壇',
+  '��' => '壅',
+  '��' => '奮',
+  '��' => '嬝',
+  '��' => '嬴',
+  '��' => '學',
+  '��' => '寰',
+  '��' => '導',
+  '��' => '彊',
+  '��' => '憲',
+  '��' => '憑',
+  '��' => '憩',
+  '��' => '憊',
+  '��' => '懍',
+  '��' => '憶',
+  '��' => '憾',
+  '��' => '懊',
+  '��' => '懈',
+  '��' => '戰',
+  '��' => '擅',
+  '��' => '擁',
+  '��' => '擋',
+  '��' => '撻',
+  '��' => '撼',
+  '��' => '據',
+  '��' => '擄',
+  '��' => '擇',
+  '��' => '擂',
+  '��' => '操',
+  '��' => '撿',
+  '��' => '擒',
+  '��' => '擔',
+  '��' => '撾',
+  '��' => '整',
+  '��' => '曆',
+  '��' => '曉',
+  '��' => '暹',
+  '��' => '曄',
+  '��' => '曇',
+  '��' => '暸',
+  '��' => '樽',
+  '��' => '樸',
+  '��' => '樺',
+  '��' => '橙',
+  '��' => '橫',
+  '��' => '橘',
+  '��' => '樹',
+  '��' => '橄',
+  '��' => '橢',
+  '��' => '橡',
+  '��' => '橋',
+  '��' => '橇',
+  '��' => '樵',
+  '��' => '機',
+  '��' => '橈',
+  '��' => '歙',
+  '��' => '歷',
+  '��' => '氅',
+  '��' => '濂',
+  '��' => '澱',
+  '��' => '澡',
+  '�@' => '濃',
+  '�A' => '澤',
+  '�B' => '濁',
+  '�C' => '澧',
+  '�D' => '澳',
+  '�E' => '激',
+  '�F' => '澹',
+  '�G' => '澶',
+  '�H' => '澦',
+  '�I' => '澠',
+  '�J' => '澴',
+  '�K' => '熾',
+  '�L' => '燉',
+  '�M' => '燐',
+  '�N' => '燒',
+  '�O' => '燈',
+  '�P' => '燕',
+  '�Q' => '熹',
+  '�R' => '燎',
+  '�S' => '燙',
+  '�T' => '燜',
+  '�U' => '燃',
+  '�V' => '燄',
+  '�W' => '獨',
+  '�X' => '璜',
+  '�Y' => '璣',
+  '�Z' => '璘',
+  '�[' => '璟',
+  '�\\' => '璞',
+  '�]' => '瓢',
+  '�^' => '甌',
+  '�_' => '甍',
+  '�`' => '瘴',
+  '�a' => '瘸',
+  '�b' => '瘺',
+  '�c' => '盧',
+  '�d' => '盥',
+  '�e' => '瞠',
+  '�f' => '瞞',
+  '�g' => '瞟',
+  '�h' => '瞥',
+  '�i' => '磨',
+  '�j' => '磚',
+  '�k' => '磬',
+  '�l' => '磧',
+  '�m' => '禦',
+  '�n' => '積',
+  '�o' => '穎',
+  '�p' => '穆',
+  '�q' => '穌',
+  '�r' => '穋',
+  '�s' => '窺',
+  '�t' => '篙',
+  '�u' => '簑',
+  '�v' => '築',
+  '�w' => '篤',
+  '�x' => '篛',
+  '�y' => '篡',
+  '�z' => '篩',
+  '�{' => '篦',
+  '�|' => '糕',
+  '�}' => '糖',
+  '�~' => '縊',
+  '��' => '縑',
+  '��' => '縈',
+  '��' => '縛',
+  '��' => '縣',
+  '��' => '縞',
+  '��' => '縝',
+  '��' => '縉',
+  '��' => '縐',
+  '��' => '罹',
+  '��' => '羲',
+  '��' => '翰',
+  '��' => '翱',
+  '��' => '翮',
+  '��' => '耨',
+  '��' => '膳',
+  '��' => '膩',
+  '��' => '膨',
+  '��' => '臻',
+  '��' => '興',
+  '��' => '艘',
+  '��' => '艙',
+  '��' => '蕊',
+  '��' => '蕙',
+  '��' => '蕈',
+  '��' => '蕨',
+  '��' => '蕩',
+  '��' => '蕃',
+  '��' => '蕉',
+  '��' => '蕭',
+  '��' => '蕪',
+  '��' => '蕞',
+  '��' => '螃',
+  '��' => '螟',
+  '��' => '螞',
+  '��' => '螢',
+  '��' => '融',
+  '��' => '衡',
+  '��' => '褪',
+  '��' => '褲',
+  '��' => '褥',
+  '��' => '褫',
+  '��' => '褡',
+  '��' => '親',
+  '��' => '覦',
+  '��' => '諦',
+  '��' => '諺',
+  '��' => '諫',
+  '��' => '諱',
+  '��' => '謀',
+  '��' => '諜',
+  '��' => '諧',
+  '��' => '諮',
+  '��' => '諾',
+  '��' => '謁',
+  '��' => '謂',
+  '��' => '諷',
+  '��' => '諭',
+  '��' => '諳',
+  '��' => '諶',
+  '��' => '諼',
+  '��' => '豫',
+  '��' => '豭',
+  '��' => '貓',
+  '��' => '賴',
+  '��' => '蹄',
+  '��' => '踱',
+  '��' => '踴',
+  '��' => '蹂',
+  '��' => '踹',
+  '��' => '踵',
+  '��' => '輻',
+  '��' => '輯',
+  '��' => '輸',
+  '��' => '輳',
+  '��' => '辨',
+  '��' => '辦',
+  '��' => '遵',
+  '��' => '遴',
+  '��' => '選',
+  '��' => '遲',
+  '��' => '遼',
+  '��' => '遺',
+  '��' => '鄴',
+  '��' => '醒',
+  '��' => '錠',
+  '��' => '錶',
+  '��' => '鋸',
+  '��' => '錳',
+  '��' => '錯',
+  '��' => '錢',
+  '��' => '鋼',
+  '��' => '錫',
+  '��' => '錄',
+  '��' => '錚',
+  '�@' => '錐',
+  '�A' => '錦',
+  '�B' => '錡',
+  '�C' => '錕',
+  '�D' => '錮',
+  '�E' => '錙',
+  '�F' => '閻',
+  '�G' => '隧',
+  '�H' => '隨',
+  '�I' => '險',
+  '�J' => '雕',
+  '�K' => '霎',
+  '�L' => '霑',
+  '�M' => '霖',
+  '�N' => '霍',
+  '�O' => '霓',
+  '�P' => '霏',
+  '�Q' => '靛',
+  '�R' => '靜',
+  '�S' => '靦',
+  '�T' => '鞘',
+  '�U' => '頰',
+  '�V' => '頸',
+  '�W' => '頻',
+  '�X' => '頷',
+  '�Y' => '頭',
+  '�Z' => '頹',
+  '�[' => '頤',
+  '�\\' => '餐',
+  '�]' => '館',
+  '�^' => '餞',
+  '�_' => '餛',
+  '�`' => '餡',
+  '�a' => '餚',
+  '�b' => '駭',
+  '�c' => '駢',
+  '�d' => '駱',
+  '�e' => '骸',
+  '�f' => '骼',
+  '�g' => '髻',
+  '�h' => '髭',
+  '�i' => '鬨',
+  '�j' => '鮑',
+  '�k' => '鴕',
+  '�l' => '鴣',
+  '�m' => '鴦',
+  '�n' => '鴨',
+  '�o' => '鴒',
+  '�p' => '鴛',
+  '�q' => '默',
+  '�r' => '黔',
+  '�s' => '龍',
+  '�t' => '龜',
+  '�u' => '優',
+  '�v' => '償',
+  '�w' => '儡',
+  '�x' => '儲',
+  '�y' => '勵',
+  '�z' => '嚎',
+  '�{' => '嚀',
+  '�|' => '嚐',
+  '�}' => '嚅',
+  '�~' => '嚇',
+  '��' => '嚏',
+  '��' => '壕',
+  '��' => '壓',
+  '��' => '壑',
+  '��' => '壎',
+  '��' => '嬰',
+  '��' => '嬪',
+  '��' => '嬤',
+  '��' => '孺',
+  '��' => '尷',
+  '��' => '屨',
+  '��' => '嶼',
+  '��' => '嶺',
+  '��' => '嶽',
+  '��' => '嶸',
+  '��' => '幫',
+  '��' => '彌',
+  '��' => '徽',
+  '��' => '應',
+  '��' => '懂',
+  '��' => '懇',
+  '��' => '懦',
+  '��' => '懋',
+  '��' => '戲',
+  '��' => '戴',
+  '��' => '擎',
+  '��' => '擊',
+  '��' => '擘',
+  '��' => '擠',
+  '��' => '擰',
+  '��' => '擦',
+  '��' => '擬',
+  '��' => '擱',
+  '��' => '擢',
+  '��' => '擭',
+  '��' => '斂',
+  '��' => '斃',
+  '��' => '曙',
+  '��' => '曖',
+  '��' => '檀',
+  '��' => '檔',
+  '��' => '檄',
+  '��' => '檢',
+  '��' => '檜',
+  '��' => '櫛',
+  '��' => '檣',
+  '��' => '橾',
+  '��' => '檗',
+  '��' => '檐',
+  '��' => '檠',
+  '��' => '歜',
+  '��' => '殮',
+  '��' => '毚',
+  '��' => '氈',
+  '��' => '濘',
+  '��' => '濱',
+  '��' => '濟',
+  '��' => '濠',
+  '��' => '濛',
+  '��' => '濤',
+  '��' => '濫',
+  '��' => '濯',
+  '��' => '澀',
+  '��' => '濬',
+  '��' => '濡',
+  '��' => '濩',
+  '��' => '濕',
+  '��' => '濮',
+  '��' => '濰',
+  '��' => '燧',
+  '��' => '營',
+  '��' => '燮',
+  '��' => '燦',
+  '��' => '燥',
+  '��' => '燭',
+  '��' => '燬',
+  '��' => '燴',
+  '��' => '燠',
+  '��' => '爵',
+  '��' => '牆',
+  '��' => '獰',
+  '��' => '獲',
+  '��' => '璩',
+  '��' => '環',
+  '��' => '璦',
+  '��' => '璨',
+  '��' => '癆',
+  '��' => '療',
+  '��' => '癌',
+  '��' => '盪',
+  '��' => '瞳',
+  '��' => '瞪',
+  '��' => '瞰',
+  '��' => '瞬',
+  '�@' => '瞧',
+  '�A' => '瞭',
+  '�B' => '矯',
+  '�C' => '磷',
+  '�D' => '磺',
+  '�E' => '磴',
+  '�F' => '磯',
+  '�G' => '礁',
+  '�H' => '禧',
+  '�I' => '禪',
+  '�J' => '穗',
+  '�K' => '窿',
+  '�L' => '簇',
+  '�M' => '簍',
+  '�N' => '篾',
+  '�O' => '篷',
+  '�P' => '簌',
+  '�Q' => '篠',
+  '�R' => '糠',
+  '�S' => '糜',
+  '�T' => '糞',
+  '�U' => '糢',
+  '�V' => '糟',
+  '�W' => '糙',
+  '�X' => '糝',
+  '�Y' => '縮',
+  '�Z' => '績',
+  '�[' => '繆',
+  '�\\' => '縷',
+  '�]' => '縲',
+  '�^' => '繃',
+  '�_' => '縫',
+  '�`' => '總',
+  '�a' => '縱',
+  '�b' => '繅',
+  '�c' => '繁',
+  '�d' => '縴',
+  '�e' => '縹',
+  '�f' => '繈',
+  '�g' => '縵',
+  '�h' => '縿',
+  '�i' => '縯',
+  '�j' => '罄',
+  '�k' => '翳',
+  '�l' => '翼',
+  '�m' => '聱',
+  '�n' => '聲',
+  '�o' => '聰',
+  '�p' => '聯',
+  '�q' => '聳',
+  '�r' => '臆',
+  '�s' => '臃',
+  '�t' => '膺',
+  '�u' => '臂',
+  '�v' => '臀',
+  '�w' => '膿',
+  '�x' => '膽',
+  '�y' => '臉',
+  '�z' => '膾',
+  '�{' => '臨',
+  '�|' => '舉',
+  '�}' => '艱',
+  '�~' => '薪',
+  '��' => '薄',
+  '��' => '蕾',
+  '��' => '薜',
+  '��' => '薑',
+  '��' => '薔',
+  '��' => '薯',
+  '��' => '薛',
+  '��' => '薇',
+  '��' => '薨',
+  '��' => '薊',
+  '��' => '虧',
+  '��' => '蟀',
+  '��' => '蟑',
+  '��' => '螳',
+  '��' => '蟒',
+  '��' => '蟆',
+  '��' => '螫',
+  '��' => '螻',
+  '��' => '螺',
+  '��' => '蟈',
+  '��' => '蟋',
+  '��' => '褻',
+  '��' => '褶',
+  '��' => '襄',
+  '��' => '褸',
+  '��' => '褽',
+  '��' => '覬',
+  '��' => '謎',
+  '��' => '謗',
+  '��' => '謙',
+  '��' => '講',
+  '��' => '謊',
+  '��' => '謠',
+  '��' => '謝',
+  '��' => '謄',
+  '��' => '謐',
+  '��' => '豁',
+  '��' => '谿',
+  '��' => '豳',
+  '��' => '賺',
+  '��' => '賽',
+  '��' => '購',
+  '��' => '賸',
+  '��' => '賻',
+  '��' => '趨',
+  '��' => '蹉',
+  '��' => '蹋',
+  '��' => '蹈',
+  '��' => '蹊',
+  '��' => '轄',
+  '��' => '輾',
+  '��' => '轂',
+  '��' => '轅',
+  '��' => '輿',
+  '��' => '避',
+  '��' => '遽',
+  '��' => '還',
+  '��' => '邁',
+  '��' => '邂',
+  '��' => '邀',
+  '��' => '鄹',
+  '��' => '醣',
+  '��' => '醞',
+  '��' => '醜',
+  '��' => '鍍',
+  '��' => '鎂',
+  '��' => '錨',
+  '��' => '鍵',
+  '��' => '鍊',
+  '��' => '鍥',
+  '��' => '鍋',
+  '��' => '錘',
+  '��' => '鍾',
+  '��' => '鍬',
+  '��' => '鍛',
+  '��' => '鍰',
+  '��' => '鍚',
+  '��' => '鍔',
+  '��' => '闊',
+  '��' => '闋',
+  '��' => '闌',
+  '��' => '闈',
+  '��' => '闆',
+  '��' => '隱',
+  '��' => '隸',
+  '��' => '雖',
+  '��' => '霜',
+  '��' => '霞',
+  '��' => '鞠',
+  '��' => '韓',
+  '��' => '顆',
+  '��' => '颶',
+  '��' => '餵',
+  '��' => '騁',
+  '�@' => '駿',
+  '�A' => '鮮',
+  '�B' => '鮫',
+  '�C' => '鮪',
+  '�D' => '鮭',
+  '�E' => '鴻',
+  '�F' => '鴿',
+  '�G' => '麋',
+  '�H' => '黏',
+  '�I' => '點',
+  '�J' => '黜',
+  '�K' => '黝',
+  '�L' => '黛',
+  '�M' => '鼾',
+  '�N' => '齋',
+  '�O' => '叢',
+  '�P' => '嚕',
+  '�Q' => '嚮',
+  '�R' => '壙',
+  '�S' => '壘',
+  '�T' => '嬸',
+  '�U' => '彝',
+  '�V' => '懣',
+  '�W' => '戳',
+  '�X' => '擴',
+  '�Y' => '擲',
+  '�Z' => '擾',
+  '�[' => '攆',
+  '�\\' => '擺',
+  '�]' => '擻',
+  '�^' => '擷',
+  '�_' => '斷',
+  '�`' => '曜',
+  '�a' => '朦',
+  '�b' => '檳',
+  '�c' => '檬',
+  '�d' => '櫃',
+  '�e' => '檻',
+  '�f' => '檸',
+  '�g' => '櫂',
+  '�h' => '檮',
+  '�i' => '檯',
+  '�j' => '歟',
+  '�k' => '歸',
+  '�l' => '殯',
+  '�m' => '瀉',
+  '�n' => '瀋',
+  '�o' => '濾',
+  '�p' => '瀆',
+  '�q' => '濺',
+  '�r' => '瀑',
+  '�s' => '瀏',
+  '�t' => '燻',
+  '�u' => '燼',
+  '�v' => '燾',
+  '�w' => '燸',
+  '�x' => '獷',
+  '�y' => '獵',
+  '�z' => '璧',
+  '�{' => '璿',
+  '�|' => '甕',
+  '�}' => '癖',
+  '�~' => '癘',
+  '¡' => '癒',
+  '¢' => '瞽',
+  '£' => '瞿',
+  '¤' => '瞻',
+  '¥' => '瞼',
+  '¦' => '礎',
+  '§' => '禮',
+  '¨' => '穡',
+  '©' => '穢',
+  'ª' => '穠',
+  '«' => '竄',
+  '¬' => '竅',
+  '­' => '簫',
+  '®' => '簧',
+  '¯' => '簪',
+  '°' => '簞',
+  '±' => '簣',
+  '²' => '簡',
+  '³' => '糧',
+  '´' => '織',
+  'µ' => '繕',
+  '¶' => '繞',
+  '·' => '繚',
+  '¸' => '繡',
+  '¹' => '繒',
+  'º' => '繙',
+  '»' => '罈',
+  '¼' => '翹',
+  '½' => '翻',
+  '¾' => '職',
+  '¿' => '聶',
+  '��' => '臍',
+  '��' => '臏',
+  '��' => '舊',
+  '��' => '藏',
+  '��' => '薩',
+  '��' => '藍',
+  '��' => '藐',
+  '��' => '藉',
+  '��' => '薰',
+  '��' => '薺',
+  '��' => '薹',
+  '��' => '薦',
+  '��' => '蟯',
+  '��' => '蟬',
+  '��' => '蟲',
+  '��' => '蟠',
+  '��' => '覆',
+  '��' => '覲',
+  '��' => '觴',
+  '��' => '謨',
+  '��' => '謹',
+  '��' => '謬',
+  '��' => '謫',
+  '��' => '豐',
+  '��' => '贅',
+  '��' => '蹙',
+  '��' => '蹣',
+  '��' => '蹦',
+  '��' => '蹤',
+  '��' => '蹟',
+  '��' => '蹕',
+  '��' => '軀',
+  '��' => '轉',
+  '��' => '轍',
+  '��' => '邇',
+  '��' => '邃',
+  '��' => '邈',
+  '��' => '醫',
+  '��' => '醬',
+  '��' => '釐',
+  '��' => '鎔',
+  '��' => '鎊',
+  '��' => '鎖',
+  '��' => '鎢',
+  '��' => '鎳',
+  '��' => '鎮',
+  '��' => '鎬',
+  '��' => '鎰',
+  '��' => '鎘',
+  '��' => '鎚',
+  '��' => '鎗',
+  '��' => '闔',
+  '��' => '闖',
+  '��' => '闐',
+  '��' => '闕',
+  '��' => '離',
+  '��' => '雜',
+  '��' => '雙',
+  '��' => '雛',
+  '��' => '雞',
+  '��' => '霤',
+  '��' => '鞣',
+  '��' => '鞦',
+  '�@' => '鞭',
+  '�A' => '韹',
+  '�B' => '額',
+  '�C' => '顏',
+  '�D' => '題',
+  '�E' => '顎',
+  '�F' => '顓',
+  '�G' => '颺',
+  '�H' => '餾',
+  '�I' => '餿',
+  '�J' => '餽',
+  '�K' => '餮',
+  '�L' => '馥',
+  '�M' => '騎',
+  '�N' => '髁',
+  '�O' => '鬃',
+  '�P' => '鬆',
+  '�Q' => '魏',
+  '�R' => '魎',
+  '�S' => '魍',
+  '�T' => '鯊',
+  '�U' => '鯉',
+  '�V' => '鯽',
+  '�W' => '鯈',
+  '�X' => '鯀',
+  '�Y' => '鵑',
+  '�Z' => '鵝',
+  '�[' => '鵠',
+  '�\\' => '黠',
+  '�]' => '鼕',
+  '�^' => '鼬',
+  '�_' => '儳',
+  '�`' => '嚥',
+  '�a' => '壞',
+  '�b' => '壟',
+  '�c' => '壢',
+  '�d' => '寵',
+  '�e' => '龐',
+  '�f' => '廬',
+  '�g' => '懲',
+  '�h' => '懷',
+  '�i' => '懶',
+  '�j' => '懵',
+  '�k' => '攀',
+  '�l' => '攏',
+  '�m' => '曠',
+  '�n' => '曝',
+  '�o' => '櫥',
+  '�p' => '櫝',
+  '�q' => '櫚',
+  '�r' => '櫓',
+  '�s' => '瀛',
+  '�t' => '瀟',
+  '�u' => '瀨',
+  '�v' => '瀚',
+  '�w' => '瀝',
+  '�x' => '瀕',
+  '�y' => '瀘',
+  '�z' => '爆',
+  '�{' => '爍',
+  '�|' => '牘',
+  '�}' => '犢',
+  '�~' => '獸',
+  'á' => '獺',
+  'â' => '璽',
+  'ã' => '瓊',
+  'ä' => '瓣',
+  'å' => '疇',
+  'æ' => '疆',
+  'ç' => '癟',
+  'è' => '癡',
+  'é' => '矇',
+  'ê' => '礙',
+  'ë' => '禱',
+  'ì' => '穫',
+  'í' => '穩',
+  'î' => '簾',
+  'ï' => '簿',
+  'ð' => '簸',
+  'ñ' => '簽',
+  'ò' => '簷',
+  'ó' => '籀',
+  'ô' => '繫',
+  'õ' => '繭',
+  'ö' => '繹',
+  '÷' => '繩',
+  'ø' => '繪',
+  'ù' => '羅',
+  'ú' => '繳',
+  'û' => '羶',
+  'ü' => '羹',
+  'ý' => '羸',
+  'þ' => '臘',
+  'ÿ' => '藩',
+  '��' => '藝',
+  '��' => '藪',
+  '��' => '藕',
+  '��' => '藤',
+  '��' => '藥',
+  '��' => '藷',
+  '��' => '蟻',
+  '��' => '蠅',
+  '��' => '蠍',
+  '��' => '蟹',
+  '��' => '蟾',
+  '��' => '襠',
+  '��' => '襟',
+  '��' => '襖',
+  '��' => '襞',
+  '��' => '譁',
+  '��' => '譜',
+  '��' => '識',
+  '��' => '證',
+  '��' => '譚',
+  '��' => '譎',
+  '��' => '譏',
+  '��' => '譆',
+  '��' => '譙',
+  '��' => '贈',
+  '��' => '贊',
+  '��' => '蹼',
+  '��' => '蹲',
+  '��' => '躇',
+  '��' => '蹶',
+  '��' => '蹬',
+  '��' => '蹺',
+  '��' => '蹴',
+  '��' => '轔',
+  '��' => '轎',
+  '��' => '辭',
+  '��' => '邊',
+  '��' => '邋',
+  '��' => '醱',
+  '��' => '醮',
+  '��' => '鏡',
+  '��' => '鏑',
+  '��' => '鏟',
+  '��' => '鏃',
+  '��' => '鏈',
+  '��' => '鏜',
+  '��' => '鏝',
+  '��' => '鏖',
+  '��' => '鏢',
+  '��' => '鏍',
+  '��' => '鏘',
+  '��' => '鏤',
+  '��' => '鏗',
+  '��' => '鏨',
+  '��' => '關',
+  '��' => '隴',
+  '��' => '難',
+  '��' => '霪',
+  '��' => '霧',
+  '��' => '靡',
+  '��' => '韜',
+  '��' => '韻',
+  '��' => '類',
+  '�@' => '願',
+  '�A' => '顛',
+  '�B' => '颼',
+  '�C' => '饅',
+  '�D' => '饉',
+  '�E' => '騖',
+  '�F' => '騙',
+  '�G' => '鬍',
+  '�H' => '鯨',
+  '�I' => '鯧',
+  '�J' => '鯖',
+  '�K' => '鯛',
+  '�L' => '鶉',
+  '�M' => '鵡',
+  '�N' => '鵲',
+  '�O' => '鵪',
+  '�P' => '鵬',
+  '�Q' => '麒',
+  '�R' => '麗',
+  '�S' => '麓',
+  '�T' => '麴',
+  '�U' => '勸',
+  '�V' => '嚨',
+  '�W' => '嚷',
+  '�X' => '嚶',
+  '�Y' => '嚴',
+  '�Z' => '嚼',
+  '�[' => '壤',
+  '�\\' => '孀',
+  '�]' => '孃',
+  '�^' => '孽',
+  '�_' => '寶',
+  '�`' => '巉',
+  '�a' => '懸',
+  '�b' => '懺',
+  '�c' => '攘',
+  '�d' => '攔',
+  '�e' => '攙',
+  '�f' => '曦',
+  '�g' => '朧',
+  '�h' => '櫬',
+  '�i' => '瀾',
+  '�j' => '瀰',
+  '�k' => '瀲',
+  '�l' => '爐',
+  '�m' => '獻',
+  '�n' => '瓏',
+  '�o' => '癢',
+  '�p' => '癥',
+  '�q' => '礦',
+  '�r' => '礪',
+  '�s' => '礬',
+  '�t' => '礫',
+  '�u' => '竇',
+  '�v' => '競',
+  '�w' => '籌',
+  '�x' => '籃',
+  '�y' => '籍',
+  '�z' => '糯',
+  '�{' => '糰',
+  '�|' => '辮',
+  '�}' => '繽',
+  '�~' => '繼',
+  'ġ' => '纂',
+  'Ģ' => '罌',
+  'ģ' => '耀',
+  'Ĥ' => '臚',
+  'ĥ' => '艦',
+  'Ħ' => '藻',
+  'ħ' => '藹',
+  'Ĩ' => '蘑',
+  'ĩ' => '藺',
+  'Ī' => '蘆',
+  'ī' => '蘋',
+  'Ĭ' => '蘇',
+  'ĭ' => '蘊',
+  'Į' => '蠔',
+  'į' => '蠕',
+  'İ' => '襤',
+  'ı' => '覺',
+  'IJ' => '觸',
+  'ij' => '議',
+  'Ĵ' => '譬',
+  'ĵ' => '警',
+  'Ķ' => '譯',
+  'ķ' => '譟',
+  'ĸ' => '譫',
+  'Ĺ' => '贏',
+  'ĺ' => '贍',
+  'Ļ' => '躉',
+  'ļ' => '躁',
+  'Ľ' => '躅',
+  'ľ' => '躂',
+  'Ŀ' => '醴',
+  '��' => '釋',
+  '��' => '鐘',
+  '��' => '鐃',
+  '��' => '鏽',
+  '��' => '闡',
+  '��' => '霰',
+  '��' => '飄',
+  '��' => '饒',
+  '��' => '饑',
+  '��' => '馨',
+  '��' => '騫',
+  '��' => '騰',
+  '��' => '騷',
+  '��' => '騵',
+  '��' => '鰓',
+  '��' => '鰍',
+  '��' => '鹹',
+  '��' => '麵',
+  '��' => '黨',
+  '��' => '鼯',
+  '��' => '齟',
+  '��' => '齣',
+  '��' => '齡',
+  '��' => '儷',
+  '��' => '儸',
+  '��' => '囁',
+  '��' => '囀',
+  '��' => '囂',
+  '��' => '夔',
+  '��' => '屬',
+  '��' => '巍',
+  '��' => '懼',
+  '��' => '懾',
+  '��' => '攝',
+  '��' => '攜',
+  '��' => '斕',
+  '��' => '曩',
+  '��' => '櫻',
+  '��' => '欄',
+  '��' => '櫺',
+  '��' => '殲',
+  '��' => '灌',
+  '��' => '爛',
+  '��' => '犧',
+  '��' => '瓖',
+  '��' => '瓔',
+  '��' => '癩',
+  '��' => '矓',
+  '��' => '籐',
+  '��' => '纏',
+  '��' => '續',
+  '��' => '羼',
+  '��' => '蘗',
+  '��' => '蘭',
+  '��' => '蘚',
+  '��' => '蠣',
+  '��' => '蠢',
+  '��' => '蠡',
+  '��' => '蠟',
+  '��' => '襪',
+  '��' => '襬',
+  '��' => '覽',
+  '��' => '譴',
+  '�@' => '護',
+  '�A' => '譽',
+  '�B' => '贓',
+  '�C' => '躊',
+  '�D' => '躍',
+  '�E' => '躋',
+  '�F' => '轟',
+  '�G' => '辯',
+  '�H' => '醺',
+  '�I' => '鐮',
+  '�J' => '鐳',
+  '�K' => '鐵',
+  '�L' => '鐺',
+  '�M' => '鐸',
+  '�N' => '鐲',
+  '�O' => '鐫',
+  '�P' => '闢',
+  '�Q' => '霸',
+  '�R' => '霹',
+  '�S' => '露',
+  '�T' => '響',
+  '�U' => '顧',
+  '�V' => '顥',
+  '�W' => '饗',
+  '�X' => '驅',
+  '�Y' => '驃',
+  '�Z' => '驀',
+  '�[' => '騾',
+  '�\\' => '髏',
+  '�]' => '魔',
+  '�^' => '魑',
+  '�_' => '鰭',
+  '�`' => '鰥',
+  '�a' => '鶯',
+  '�b' => '鶴',
+  '�c' => '鷂',
+  '�d' => '鶸',
+  '�e' => '麝',
+  '�f' => '黯',
+  '�g' => '鼙',
+  '�h' => '齜',
+  '�i' => '齦',
+  '�j' => '齧',
+  '�k' => '儼',
+  '�l' => '儻',
+  '�m' => '囈',
+  '�n' => '囊',
+  '�o' => '囉',
+  '�p' => '孿',
+  '�q' => '巔',
+  '�r' => '巒',
+  '�s' => '彎',
+  '�t' => '懿',
+  '�u' => '攤',
+  '�v' => '權',
+  '�w' => '歡',
+  '�x' => '灑',
+  '�y' => '灘',
+  '�z' => '玀',
+  '�{' => '瓤',
+  '�|' => '疊',
+  '�}' => '癮',
+  '�~' => '癬',
+  'š' => '禳',
+  'Ţ' => '籠',
+  'ţ' => '籟',
+  'Ť' => '聾',
+  'ť' => '聽',
+  'Ŧ' => '臟',
+  'ŧ' => '襲',
+  'Ũ' => '襯',
+  'ũ' => '觼',
+  'Ū' => '讀',
+  'ū' => '贖',
+  'Ŭ' => '贗',
+  'ŭ' => '躑',
+  'Ů' => '躓',
+  'ů' => '轡',
+  'Ű' => '酈',
+  'ű' => '鑄',
+  'Ų' => '鑑',
+  'ų' => '鑒',
+  'Ŵ' => '霽',
+  'ŵ' => '霾',
+  'Ŷ' => '韃',
+  'ŷ' => '韁',
+  'Ÿ' => '顫',
+  'Ź' => '饕',
+  'ź' => '驕',
+  'Ż' => '驍',
+  'ż' => '髒',
+  'Ž' => '鬚',
+  'ž' => '鱉',
+  'ſ' => '鰱',
+  '��' => '鰾',
+  '��' => '鰻',
+  '��' => '鷓',
+  '��' => '鷗',
+  '��' => '鼴',
+  '��' => '齬',
+  '��' => '齪',
+  '��' => '龔',
+  '��' => '囌',
+  '��' => '巖',
+  '��' => '戀',
+  '��' => '攣',
+  '��' => '攫',
+  '��' => '攪',
+  '��' => '曬',
+  '��' => '欐',
+  '��' => '瓚',
+  '��' => '竊',
+  '��' => '籤',
+  '��' => '籣',
+  '��' => '籥',
+  '��' => '纓',
+  '��' => '纖',
+  '��' => '纔',
+  '��' => '臢',
+  '��' => '蘸',
+  '��' => '蘿',
+  '��' => '蠱',
+  '��' => '變',
+  '��' => '邐',
+  '��' => '邏',
+  '��' => '鑣',
+  '��' => '鑠',
+  '��' => '鑤',
+  '��' => '靨',
+  '��' => '顯',
+  '��' => '饜',
+  '��' => '驚',
+  '��' => '驛',
+  '��' => '驗',
+  '��' => '髓',
+  '��' => '體',
+  '��' => '髑',
+  '��' => '鱔',
+  '��' => '鱗',
+  '��' => '鱖',
+  '��' => '鷥',
+  '��' => '麟',
+  '��' => '黴',
+  '��' => '囑',
+  '��' => '壩',
+  '��' => '攬',
+  '��' => '灞',
+  '��' => '癱',
+  '��' => '癲',
+  '��' => '矗',
+  '��' => '罐',
+  '��' => '羈',
+  '��' => '蠶',
+  '��' => '蠹',
+  '��' => '衢',
+  '��' => '讓',
+  '��' => '讒',
+  '�@' => '讖',
+  '�A' => '艷',
+  '�B' => '贛',
+  '�C' => '釀',
+  '�D' => '鑪',
+  '�E' => '靂',
+  '�F' => '靈',
+  '�G' => '靄',
+  '�H' => '韆',
+  '�I' => '顰',
+  '�J' => '驟',
+  '�K' => '鬢',
+  '�L' => '魘',
+  '�M' => '鱟',
+  '�N' => '鷹',
+  '�O' => '鷺',
+  '�P' => '鹼',
+  '�Q' => '鹽',
+  '�R' => '鼇',
+  '�S' => '齷',
+  '�T' => '齲',
+  '�U' => '廳',
+  '�V' => '欖',
+  '�W' => '灣',
+  '�X' => '籬',
+  '�Y' => '籮',
+  '�Z' => '蠻',
+  '�[' => '觀',
+  '�\\' => '躡',
+  '�]' => '釁',
+  '�^' => '鑲',
+  '�_' => '鑰',
+  '�`' => '顱',
+  '�a' => '饞',
+  '�b' => '髖',
+  '�c' => '鬣',
+  '�d' => '黌',
+  '�e' => '灤',
+  '�f' => '矚',
+  '�g' => '讚',
+  '�h' => '鑷',
+  '�i' => '韉',
+  '�j' => '驢',
+  '�k' => '驥',
+  '�l' => '纜',
+  '�m' => '讜',
+  '�n' => '躪',
+  '�o' => '釅',
+  '�p' => '鑽',
+  '�q' => '鑾',
+  '�r' => '鑼',
+  '�s' => '鱷',
+  '�t' => '鱸',
+  '�u' => '黷',
+  '�v' => '豔',
+  '�w' => '鑿',
+  '�x' => '鸚',
+  '�y' => '爨',
+  '�z' => '驪',
+  '�{' => '鬱',
+  '�|' => '鸛',
+  '�}' => '鸞',
+  '�~' => '籲',
+  'ơ' => 'ヾ',
+  'Ƣ' => 'ゝ',
+  'ƣ' => 'ゞ',
+  'Ƥ' => '々',
+  'ƥ' => 'ぁ',
+  'Ʀ' => 'あ',
+  'Ƨ' => 'ぃ',
+  'ƨ' => 'い',
+  'Ʃ' => 'ぅ',
+  'ƪ' => 'う',
+  'ƫ' => 'ぇ',
+  'Ƭ' => 'え',
+  'ƭ' => 'ぉ',
+  'Ʈ' => 'お',
+  'Ư' => 'か',
+  'ư' => 'が',
+  'Ʊ' => 'き',
+  'Ʋ' => 'ぎ',
+  'Ƴ' => 'く',
+  'ƴ' => 'ぐ',
+  'Ƶ' => 'け',
+  'ƶ' => 'げ',
+  'Ʒ' => 'こ',
+  'Ƹ' => 'ご',
+  'ƹ' => 'さ',
+  'ƺ' => 'ざ',
+  'ƻ' => 'し',
+  'Ƽ' => 'じ',
+  'ƽ' => 'す',
+  'ƾ' => 'ず',
+  'ƿ' => 'せ',
+  '��' => 'ぜ',
+  '��' => 'そ',
+  '��' => 'ぞ',
+  '��' => 'た',
+  '��' => 'だ',
+  '��' => 'ち',
+  '��' => 'ぢ',
+  '��' => 'っ',
+  '��' => 'つ',
+  '��' => 'づ',
+  '��' => 'て',
+  '��' => 'で',
+  '��' => 'と',
+  '��' => 'ど',
+  '��' => 'な',
+  '��' => 'に',
+  '��' => 'ぬ',
+  '��' => 'ね',
+  '��' => 'の',
+  '��' => 'は',
+  '��' => 'ば',
+  '��' => 'ぱ',
+  '��' => 'ひ',
+  '��' => 'び',
+  '��' => 'ぴ',
+  '��' => 'ふ',
+  '��' => 'ぶ',
+  '��' => 'ぷ',
+  '��' => 'へ',
+  '��' => 'べ',
+  '��' => 'ぺ',
+  '��' => 'ほ',
+  '��' => 'ぼ',
+  '��' => 'ぽ',
+  '��' => 'ま',
+  '��' => 'み',
+  '��' => 'む',
+  '��' => 'め',
+  '��' => 'も',
+  '��' => 'ゃ',
+  '��' => 'や',
+  '��' => 'ゅ',
+  '��' => 'ゆ',
+  '��' => 'ょ',
+  '��' => 'よ',
+  '��' => 'ら',
+  '��' => 'り',
+  '��' => 'る',
+  '��' => 'れ',
+  '��' => 'ろ',
+  '��' => 'ゎ',
+  '��' => 'わ',
+  '��' => 'ゐ',
+  '��' => 'ゑ',
+  '��' => 'を',
+  '��' => 'ん',
+  '��' => 'ァ',
+  '��' => 'ア',
+  '��' => 'ィ',
+  '��' => 'イ',
+  '��' => 'ゥ',
+  '��' => 'ウ',
+  '��' => 'ェ',
+  '�@' => 'エ',
+  '�A' => 'ォ',
+  '�B' => 'オ',
+  '�C' => 'カ',
+  '�D' => 'ガ',
+  '�E' => 'キ',
+  '�F' => 'ギ',
+  '�G' => 'ク',
+  '�H' => 'グ',
+  '�I' => 'ケ',
+  '�J' => 'ゲ',
+  '�K' => 'コ',
+  '�L' => 'ゴ',
+  '�M' => 'サ',
+  '�N' => 'ザ',
+  '�O' => 'シ',
+  '�P' => 'ジ',
+  '�Q' => 'ス',
+  '�R' => 'ズ',
+  '�S' => 'セ',
+  '�T' => 'ゼ',
+  '�U' => 'ソ',
+  '�V' => 'ゾ',
+  '�W' => 'タ',
+  '�X' => 'ダ',
+  '�Y' => 'チ',
+  '�Z' => 'ヂ',
+  '�[' => 'ッ',
+  '�\\' => 'ツ',
+  '�]' => 'ヅ',
+  '�^' => 'テ',
+  '�_' => 'デ',
+  '�`' => 'ト',
+  '�a' => 'ド',
+  '�b' => 'ナ',
+  '�c' => 'ニ',
+  '�d' => 'ヌ',
+  '�e' => 'ネ',
+  '�f' => 'ノ',
+  '�g' => 'ハ',
+  '�h' => 'バ',
+  '�i' => 'パ',
+  '�j' => 'ヒ',
+  '�k' => 'ビ',
+  '�l' => 'ピ',
+  '�m' => 'フ',
+  '�n' => 'ブ',
+  '�o' => 'プ',
+  '�p' => 'ヘ',
+  '�q' => 'ベ',
+  '�r' => 'ペ',
+  '�s' => 'ホ',
+  '�t' => 'ボ',
+  '�u' => 'ポ',
+  '�v' => 'マ',
+  '�w' => 'ミ',
+  '�x' => 'ム',
+  '�y' => 'メ',
+  '�z' => 'モ',
+  '�{' => 'ャ',
+  '�|' => 'ヤ',
+  '�}' => 'ュ',
+  '�~' => 'ユ',
+  'ǡ' => 'ョ',
+  'Ǣ' => 'ヨ',
+  'ǣ' => 'ラ',
+  'Ǥ' => 'リ',
+  'ǥ' => 'ル',
+  'Ǧ' => 'レ',
+  'ǧ' => 'ロ',
+  'Ǩ' => 'ヮ',
+  'ǩ' => 'ワ',
+  'Ǫ' => 'ヰ',
+  'ǫ' => 'ヱ',
+  'Ǭ' => 'ヲ',
+  'ǭ' => 'ン',
+  'Ǯ' => 'ヴ',
+  'ǯ' => 'ヵ',
+  'ǰ' => 'ヶ',
+  'DZ' => 'Д',
+  'Dz' => 'Е',
+  'dz' => 'Ё',
+  'Ǵ' => 'Ж',
+  'ǵ' => 'З',
+  'Ƕ' => 'И',
+  'Ƿ' => 'Й',
+  'Ǹ' => 'К',
+  'ǹ' => 'Л',
+  'Ǻ' => 'М',
+  'ǻ' => 'У',
+  'Ǽ' => 'Ф',
+  'ǽ' => 'Х',
+  'Ǿ' => 'Ц',
+  'ǿ' => 'Ч',
+  '��' => 'Ш',
+  '��' => 'Щ',
+  '��' => 'Ъ',
+  '��' => 'Ы',
+  '��' => 'Ь',
+  '��' => 'Э',
+  '��' => 'Ю',
+  '��' => 'Я',
+  '��' => 'а',
+  '��' => 'б',
+  '��' => 'в',
+  '��' => 'г',
+  '��' => 'д',
+  '��' => 'е',
+  '��' => 'ё',
+  '��' => 'ж',
+  '��' => 'з',
+  '��' => 'и',
+  '��' => 'й',
+  '��' => 'к',
+  '��' => 'л',
+  '��' => 'м',
+  '��' => 'н',
+  '��' => 'о',
+  '��' => 'п',
+  '��' => 'р',
+  '��' => 'с',
+  '��' => 'т',
+  '��' => 'у',
+  '��' => 'ф',
+  '��' => 'х',
+  '��' => 'ц',
+  '��' => 'ч',
+  '��' => 'ш',
+  '��' => 'щ',
+  '��' => 'ъ',
+  '��' => 'ы',
+  '��' => 'ь',
+  '��' => 'э',
+  '��' => 'ю',
+  '��' => 'я',
+  '��' => '①',
+  '��' => '②',
+  '��' => '③',
+  '��' => '④',
+  '��' => '⑤',
+  '��' => '⑥',
+  '��' => '⑦',
+  '��' => '⑧',
+  '��' => '⑨',
+  '��' => '⑩',
+  '��' => '⑴',
+  '��' => '⑵',
+  '��' => '⑶',
+  '��' => '⑷',
+  '��' => '⑸',
+  '��' => '⑹',
+  '��' => '⑺',
+  '��' => '⑻',
+  '��' => '⑼',
+  '��' => '⑽',
+  '�@' => '乂',
+  '�A' => '乜',
+  '�B' => '凵',
+  '�C' => '匚',
+  '�D' => '厂',
+  '�E' => '万',
+  '�F' => '丌',
+  '�G' => '乇',
+  '�H' => '亍',
+  '�I' => '囗',
+  '�J' => '兀',
+  '�K' => '屮',
+  '�L' => '彳',
+  '�M' => '丏',
+  '�N' => '冇',
+  '�O' => '与',
+  '�P' => '丮',
+  '�Q' => '亓',
+  '�R' => '仂',
+  '�S' => '仉',
+  '�T' => '仈',
+  '�U' => '冘',
+  '�V' => '勼',
+  '�W' => '卬',
+  '�X' => '厹',
+  '�Y' => '圠',
+  '�Z' => '夃',
+  '�[' => '夬',
+  '�\\' => '尐',
+  '�]' => '巿',
+  '�^' => '旡',
+  '�_' => '殳',
+  '�`' => '毌',
+  '�a' => '气',
+  '�b' => '爿',
+  '�c' => '丱',
+  '�d' => '丼',
+  '�e' => '仨',
+  '�f' => '仜',
+  '�g' => '仩',
+  '�h' => '仡',
+  '�i' => '仝',
+  '�j' => '仚',
+  '�k' => '刌',
+  '�l' => '匜',
+  '�m' => '卌',
+  '�n' => '圢',
+  '�o' => '圣',
+  '�p' => '夗',
+  '�q' => '夯',
+  '�r' => '宁',
+  '�s' => '宄',
+  '�t' => '尒',
+  '�u' => '尻',
+  '�v' => '屴',
+  '�w' => '屳',
+  '�x' => '帄',
+  '�y' => '庀',
+  '�z' => '庂',
+  '�{' => '忉',
+  '�|' => '戉',
+  '�}' => '扐',
+  '�~' => '氕',
+  'ɡ' => '氶',
+  'ɢ' => '汃',
+  'ɣ' => '氿',
+  'ɤ' => '氻',
+  'ɥ' => '犮',
+  'ɦ' => '犰',
+  'ɧ' => '玊',
+  'ɨ' => '禸',
+  'ɩ' => '肊',
+  'ɪ' => '阞',
+  'ɫ' => '伎',
+  'ɬ' => '优',
+  'ɭ' => '伬',
+  'ɮ' => '仵',
+  'ɯ' => '伔',
+  'ɰ' => '仱',
+  'ɱ' => '伀',
+  'ɲ' => '价',
+  'ɳ' => '伈',
+  'ɴ' => '伝',
+  'ɵ' => '伂',
+  'ɶ' => '伅',
+  'ɷ' => '伢',
+  'ɸ' => '伓',
+  'ɹ' => '伄',
+  'ɺ' => '仴',
+  'ɻ' => '伒',
+  'ɼ' => '冱',
+  'ɽ' => '刓',
+  'ɾ' => '刉',
+  'ɿ' => '刐',
+  '��' => '劦',
+  '��' => '匢',
+  '��' => '匟',
+  '��' => '卍',
+  '��' => '厊',
+  '��' => '吇',
+  '��' => '囡',
+  '��' => '囟',
+  '��' => '圮',
+  '��' => '圪',
+  '��' => '圴',
+  '��' => '夼',
+  '��' => '妀',
+  '��' => '奼',
+  '��' => '妅',
+  '��' => '奻',
+  '��' => '奾',
+  '��' => '奷',
+  '��' => '奿',
+  '��' => '孖',
+  '��' => '尕',
+  '��' => '尥',
+  '��' => '屼',
+  '��' => '屺',
+  '��' => '屻',
+  '��' => '屾',
+  '��' => '巟',
+  '��' => '幵',
+  '��' => '庄',
+  '��' => '异',
+  '��' => '弚',
+  '��' => '彴',
+  '��' => '忕',
+  '��' => '忔',
+  '��' => '忏',
+  '��' => '扜',
+  '��' => '扞',
+  '��' => '扤',
+  '��' => '扡',
+  '��' => '扦',
+  '��' => '扢',
+  '��' => '扙',
+  '��' => '扠',
+  '��' => '扚',
+  '��' => '扥',
+  '��' => '旯',
+  '��' => '旮',
+  '��' => '朾',
+  '��' => '朹',
+  '��' => '朸',
+  '��' => '朻',
+  '��' => '机',
+  '��' => '朿',
+  '��' => '朼',
+  '��' => '朳',
+  '��' => '氘',
+  '��' => '汆',
+  '��' => '汒',
+  '��' => '汜',
+  '��' => '汏',
+  '��' => '汊',
+  '��' => '汔',
+  '��' => '汋',
+  '�@' => '汌',
+  '�A' => '灱',
+  '�B' => '牞',
+  '�C' => '犴',
+  '�D' => '犵',
+  '�E' => '玎',
+  '�F' => '甪',
+  '�G' => '癿',
+  '�H' => '穵',
+  '�I' => '网',
+  '�J' => '艸',
+  '�K' => '艼',
+  '�L' => '芀',
+  '�M' => '艽',
+  '�N' => '艿',
+  '�O' => '虍',
+  '�P' => '襾',
+  '�Q' => '邙',
+  '�R' => '邗',
+  '�S' => '邘',
+  '�T' => '邛',
+  '�U' => '邔',
+  '�V' => '阢',
+  '�W' => '阤',
+  '�X' => '阠',
+  '�Y' => '阣',
+  '�Z' => '佖',
+  '�[' => '伻',
+  '�\\' => '佢',
+  '�]' => '佉',
+  '�^' => '体',
+  '�_' => '佤',
+  '�`' => '伾',
+  '�a' => '佧',
+  '�b' => '佒',
+  '�c' => '佟',
+  '�d' => '佁',
+  '�e' => '佘',
+  '�f' => '伭',
+  '�g' => '伳',
+  '�h' => '伿',
+  '�i' => '佡',
+  '�j' => '冏',
+  '�k' => '冹',
+  '�l' => '刜',
+  '�m' => '刞',
+  '�n' => '刡',
+  '�o' => '劭',
+  '�p' => '劮',
+  '�q' => '匉',
+  '�r' => '卣',
+  '�s' => '卲',
+  '�t' => '厎',
+  '�u' => '厏',
+  '�v' => '吰',
+  '�w' => '吷',
+  '�x' => '吪',
+  '�y' => '呔',
+  '�z' => '呅',
+  '�{' => '吙',
+  '�|' => '吜',
+  '�}' => '吥',
+  '�~' => '吘',
+  'ʡ' => '吽',
+  'ʢ' => '呏',
+  'ʣ' => '呁',
+  'ʤ' => '吨',
+  'ʥ' => '吤',
+  'ʦ' => '呇',
+  'ʧ' => '囮',
+  'ʨ' => '囧',
+  'ʩ' => '囥',
+  'ʪ' => '坁',
+  'ʫ' => '坅',
+  'ʬ' => '坌',
+  'ʭ' => '坉',
+  'ʮ' => '坋',
+  'ʯ' => '坒',
+  'ʰ' => '夆',
+  'ʱ' => '奀',
+  'ʲ' => '妦',
+  'ʳ' => '妘',
+  'ʴ' => '妠',
+  'ʵ' => '妗',
+  'ʶ' => '妎',
+  'ʷ' => '妢',
+  'ʸ' => '妐',
+  'ʹ' => '妏',
+  'ʺ' => '妧',
+  'ʻ' => '妡',
+  'ʼ' => '宎',
+  'ʽ' => '宒',
+  'ʾ' => '尨',
+  'ʿ' => '尪',
+  '��' => '岍',
+  '��' => '岏',
+  '��' => '岈',
+  '��' => '岋',
+  '��' => '岉',
+  '��' => '岒',
+  '��' => '岊',
+  '��' => '岆',
+  '��' => '岓',
+  '��' => '岕',
+  '��' => '巠',
+  '��' => '帊',
+  '��' => '帎',
+  '��' => '庋',
+  '��' => '庉',
+  '��' => '庌',
+  '��' => '庈',
+  '��' => '庍',
+  '��' => '弅',
+  '��' => '弝',
+  '��' => '彸',
+  '��' => '彶',
+  '��' => '忒',
+  '��' => '忑',
+  '��' => '忐',
+  '��' => '忭',
+  '��' => '忨',
+  '��' => '忮',
+  '��' => '忳',
+  '��' => '忡',
+  '��' => '忤',
+  '��' => '忣',
+  '��' => '忺',
+  '��' => '忯',
+  '��' => '忷',
+  '��' => '忻',
+  '��' => '怀',
+  '��' => '忴',
+  '��' => '戺',
+  '��' => '抃',
+  '��' => '抌',
+  '��' => '抎',
+  '��' => '抏',
+  '��' => '抔',
+  '��' => '抇',
+  '��' => '扱',
+  '��' => '扻',
+  '��' => '扺',
+  '��' => '扰',
+  '��' => '抁',
+  '��' => '抈',
+  '��' => '扷',
+  '��' => '扽',
+  '��' => '扲',
+  '��' => '扴',
+  '��' => '攷',
+  '��' => '旰',
+  '��' => '旴',
+  '��' => '旳',
+  '��' => '旲',
+  '��' => '旵',
+  '��' => '杅',
+  '��' => '杇',
+  '�@' => '杙',
+  '�A' => '杕',
+  '�B' => '杌',
+  '�C' => '杈',
+  '�D' => '杝',
+  '�E' => '杍',
+  '�F' => '杚',
+  '�G' => '杋',
+  '�H' => '毐',
+  '�I' => '氙',
+  '�J' => '氚',
+  '�K' => '汸',
+  '�L' => '汧',
+  '�M' => '汫',
+  '�N' => '沄',
+  '�O' => '沋',
+  '�P' => '沏',
+  '�Q' => '汱',
+  '�R' => '汯',
+  '�S' => '汩',
+  '�T' => '沚',
+  '�U' => '汭',
+  '�V' => '沇',
+  '�W' => '沕',
+  '�X' => '沜',
+  '�Y' => '汦',
+  '�Z' => '汳',
+  '�[' => '汥',
+  '�\\' => '汻',
+  '�]' => '沎',
+  '�^' => '灴',
+  '�_' => '灺',
+  '�`' => '牣',
+  '�a' => '犿',
+  '�b' => '犽',
+  '�c' => '狃',
+  '�d' => '狆',
+  '�e' => '狁',
+  '�f' => '犺',
+  '�g' => '狅',
+  '�h' => '玕',
+  '�i' => '玗',
+  '�j' => '玓',
+  '�k' => '玔',
+  '�l' => '玒',
+  '�m' => '町',
+  '�n' => '甹',
+  '�o' => '疔',
+  '�p' => '疕',
+  '�q' => '皁',
+  '�r' => '礽',
+  '�s' => '耴',
+  '�t' => '肕',
+  '�u' => '肙',
+  '�v' => '肐',
+  '�w' => '肒',
+  '�x' => '肜',
+  '�y' => '芐',
+  '�z' => '芏',
+  '�{' => '芅',
+  '�|' => '芎',
+  '�}' => '芑',
+  '�~' => '芓',
+  'ˡ' => '芊',
+  'ˢ' => '芃',
+  'ˣ' => '芄',
+  'ˤ' => '豸',
+  '˥' => '迉',
+  '˦' => '辿',
+  '˧' => '邟',
+  '˨' => '邡',
+  '˩' => '邥',
+  '˪' => '邞',
+  '˫' => '邧',
+  'ˬ' => '邠',
+  '˭' => '阰',
+  'ˮ' => '阨',
+  '˯' => '阯',
+  '˰' => '阭',
+  '˱' => '丳',
+  '˲' => '侘',
+  '˳' => '佼',
+  '˴' => '侅',
+  '˵' => '佽',
+  '˶' => '侀',
+  '˷' => '侇',
+  '˸' => '佶',
+  '˹' => '佴',
+  '˺' => '侉',
+  '˻' => '侄',
+  '˼' => '佷',
+  '˽' => '佌',
+  '˾' => '侗',
+  '˿' => '佪',
+  '��' => '侚',
+  '��' => '佹',
+  '��' => '侁',
+  '��' => '佸',
+  '��' => '侐',
+  '��' => '侜',
+  '��' => '侔',
+  '��' => '侞',
+  '��' => '侒',
+  '��' => '侂',
+  '��' => '侕',
+  '��' => '佫',
+  '��' => '佮',
+  '��' => '冞',
+  '��' => '冼',
+  '��' => '冾',
+  '��' => '刵',
+  '��' => '刲',
+  '��' => '刳',
+  '��' => '剆',
+  '��' => '刱',
+  '��' => '劼',
+  '��' => '匊',
+  '��' => '匋',
+  '��' => '匼',
+  '��' => '厒',
+  '��' => '厔',
+  '��' => '咇',
+  '��' => '呿',
+  '��' => '咁',
+  '��' => '咑',
+  '��' => '咂',
+  '��' => '咈',
+  '��' => '呫',
+  '��' => '呺',
+  '��' => '呾',
+  '��' => '呥',
+  '��' => '呬',
+  '��' => '呴',
+  '��' => '呦',
+  '��' => '咍',
+  '��' => '呯',
+  '��' => '呡',
+  '��' => '呠',
+  '��' => '咘',
+  '��' => '呣',
+  '��' => '呧',
+  '��' => '呤',
+  '��' => '囷',
+  '��' => '囹',
+  '��' => '坯',
+  '��' => '坲',
+  '��' => '坭',
+  '��' => '坫',
+  '��' => '坱',
+  '��' => '坰',
+  '��' => '坶',
+  '��' => '垀',
+  '��' => '坵',
+  '��' => '坻',
+  '��' => '坳',
+  '��' => '坴',
+  '��' => '坢',
+  '�@' => '坨',
+  '�A' => '坽',
+  '�B' => '夌',
+  '�C' => '奅',
+  '�D' => '妵',
+  '�E' => '妺',
+  '�F' => '姏',
+  '�G' => '姎',
+  '�H' => '妲',
+  '�I' => '姌',
+  '�J' => '姁',
+  '�K' => '妶',
+  '�L' => '妼',
+  '�M' => '姃',
+  '�N' => '姖',
+  '�O' => '妱',
+  '�P' => '妽',
+  '�Q' => '姀',
+  '�R' => '姈',
+  '�S' => '妴',
+  '�T' => '姇',
+  '�U' => '孢',
+  '�V' => '孥',
+  '�W' => '宓',
+  '�X' => '宕',
+  '�Y' => '屄',
+  '�Z' => '屇',
+  '�[' => '岮',
+  '�\\' => '岤',
+  '�]' => '岠',
+  '�^' => '岵',
+  '�_' => '岯',
+  '�`' => '岨',
+  '�a' => '岬',
+  '�b' => '岟',
+  '�c' => '岣',
+  '�d' => '岭',
+  '�e' => '岢',
+  '�f' => '岪',
+  '�g' => '岧',
+  '�h' => '岝',
+  '�i' => '岥',
+  '�j' => '岶',
+  '�k' => '岰',
+  '�l' => '岦',
+  '�m' => '帗',
+  '�n' => '帔',
+  '�o' => '帙',
+  '�p' => '弨',
+  '�q' => '弢',
+  '�r' => '弣',
+  '�s' => '弤',
+  '�t' => '彔',
+  '�u' => '徂',
+  '�v' => '彾',
+  '�w' => '彽',
+  '�x' => '忞',
+  '�y' => '忥',
+  '�z' => '怭',
+  '�{' => '怦',
+  '�|' => '怙',
+  '�}' => '怲',
+  '�~' => '怋',
+  '̡' => '怴',
+  '̢' => '怊',
+  '̣' => '怗',
+  '̤' => '怳',
+  '̥' => '怚',
+  '̦' => '怞',
+  '̧' => '怬',
+  '̨' => '怢',
+  '̩' => '怍',
+  '̪' => '怐',
+  '̫' => '怮',
+  '̬' => '怓',
+  '̭' => '怑',
+  '̮' => '怌',
+  '̯' => '怉',
+  '̰' => '怜',
+  '̱' => '戔',
+  '̲' => '戽',
+  '̳' => '抭',
+  '̴' => '抴',
+  '̵' => '拑',
+  '̶' => '抾',
+  '̷' => '抪',
+  '̸' => '抶',
+  '̹' => '拊',
+  '̺' => '抮',
+  '̻' => '抳',
+  '̼' => '抯',
+  '̽' => '抻',
+  '̾' => '抩',
+  '̿' => '抰',
+  '��' => '抸',
+  '��' => '攽',
+  '��' => '斨',
+  '��' => '斻',
+  '��' => '昉',
+  '��' => '旼',
+  '��' => '昄',
+  '��' => '昒',
+  '��' => '昈',
+  '��' => '旻',
+  '��' => '昃',
+  '��' => '昋',
+  '��' => '昍',
+  '��' => '昅',
+  '��' => '旽',
+  '��' => '昑',
+  '��' => '昐',
+  '��' => '曶',
+  '��' => '朊',
+  '��' => '枅',
+  '��' => '杬',
+  '��' => '枎',
+  '��' => '枒',
+  '��' => '杶',
+  '��' => '杻',
+  '��' => '枘',
+  '��' => '枆',
+  '��' => '构',
+  '��' => '杴',
+  '��' => '枍',
+  '��' => '枌',
+  '��' => '杺',
+  '��' => '枟',
+  '��' => '枑',
+  '��' => '枙',
+  '��' => '枃',
+  '��' => '杽',
+  '��' => '极',
+  '��' => '杸',
+  '��' => '杹',
+  '��' => '枔',
+  '��' => '欥',
+  '��' => '殀',
+  '��' => '歾',
+  '��' => '毞',
+  '��' => '氝',
+  '��' => '沓',
+  '��' => '泬',
+  '��' => '泫',
+  '��' => '泮',
+  '��' => '泙',
+  '��' => '沶',
+  '��' => '泔',
+  '��' => '沭',
+  '��' => '泧',
+  '��' => '沷',
+  '��' => '泐',
+  '��' => '泂',
+  '��' => '沺',
+  '��' => '泃',
+  '��' => '泆',
+  '��' => '泭',
+  '��' => '泲',
+  '�@' => '泒',
+  '�A' => '泝',
+  '�B' => '沴',
+  '�C' => '沊',
+  '�D' => '沝',
+  '�E' => '沀',
+  '�F' => '泞',
+  '�G' => '泀',
+  '�H' => '洰',
+  '�I' => '泍',
+  '�J' => '泇',
+  '�K' => '沰',
+  '�L' => '泹',
+  '�M' => '泏',
+  '�N' => '泩',
+  '�O' => '泑',
+  '�P' => '炔',
+  '�Q' => '炘',
+  '�R' => '炅',
+  '�S' => '炓',
+  '�T' => '炆',
+  '�U' => '炄',
+  '�V' => '炑',
+  '�W' => '炖',
+  '�X' => '炂',
+  '�Y' => '炚',
+  '�Z' => '炃',
+  '�[' => '牪',
+  '�\\' => '狖',
+  '�]' => '狋',
+  '�^' => '狘',
+  '�_' => '狉',
+  '�`' => '狜',
+  '�a' => '狒',
+  '�b' => '狔',
+  '�c' => '狚',
+  '�d' => '狌',
+  '�e' => '狑',
+  '�f' => '玤',
+  '�g' => '玡',
+  '�h' => '玭',
+  '�i' => '玦',
+  '�j' => '玢',
+  '�k' => '玠',
+  '�l' => '玬',
+  '�m' => '玝',
+  '�n' => '瓝',
+  '�o' => '瓨',
+  '�p' => '甿',
+  '�q' => '畀',
+  '�r' => '甾',
+  '�s' => '疌',
+  '�t' => '疘',
+  '�u' => '皯',
+  '�v' => '盳',
+  '�w' => '盱',
+  '�x' => '盰',
+  '�y' => '盵',
+  '�z' => '矸',
+  '�{' => '矼',
+  '�|' => '矹',
+  '�}' => '矻',
+  '�~' => '矺',
+  '͡' => '矷',
+  '͢' => '祂',
+  'ͣ' => '礿',
+  'ͤ' => '秅',
+  'ͥ' => '穸',
+  'ͦ' => '穻',
+  'ͧ' => '竻',
+  'ͨ' => '籵',
+  'ͩ' => '糽',
+  'ͪ' => '耵',
+  'ͫ' => '肏',
+  'ͬ' => '肮',
+  'ͭ' => '肣',
+  'ͮ' => '肸',
+  'ͯ' => '肵',
+  'Ͱ' => '肭',
+  'ͱ' => '舠',
+  'Ͳ' => '芠',
+  'ͳ' => '苀',
+  'ʹ' => '芫',
+  '͵' => '芚',
+  'Ͷ' => '芘',
+  'ͷ' => '芛',
+  '͸' => '芵',
+  '͹' => '芧',
+  'ͺ' => '芮',
+  'ͻ' => '芼',
+  'ͼ' => '芞',
+  'ͽ' => '芺',
+  ';' => '芴',
+  'Ϳ' => '芨',
+  '��' => '芡',
+  '��' => '芩',
+  '��' => '苂',
+  '��' => '芤',
+  '��' => '苃',
+  '��' => '芶',
+  '��' => '芢',
+  '��' => '虰',
+  '��' => '虯',
+  '��' => '虭',
+  '��' => '虮',
+  '��' => '豖',
+  '��' => '迒',
+  '��' => '迋',
+  '��' => '迓',
+  '��' => '迍',
+  '��' => '迖',
+  '��' => '迕',
+  '��' => '迗',
+  '��' => '邲',
+  '��' => '邴',
+  '��' => '邯',
+  '��' => '邳',
+  '��' => '邰',
+  '��' => '阹',
+  '��' => '阽',
+  '��' => '阼',
+  '��' => '阺',
+  '��' => '陃',
+  '��' => '俍',
+  '��' => '俅',
+  '��' => '俓',
+  '��' => '侲',
+  '��' => '俉',
+  '��' => '俋',
+  '��' => '俁',
+  '��' => '俔',
+  '��' => '俜',
+  '��' => '俙',
+  '��' => '侻',
+  '��' => '侳',
+  '��' => '俛',
+  '��' => '俇',
+  '��' => '俖',
+  '��' => '侺',
+  '��' => '俀',
+  '��' => '侹',
+  '��' => '俬',
+  '��' => '剄',
+  '��' => '剉',
+  '��' => '勀',
+  '��' => '勂',
+  '��' => '匽',
+  '��' => '卼',
+  '��' => '厗',
+  '��' => '厖',
+  '��' => '厙',
+  '��' => '厘',
+  '��' => '咺',
+  '��' => '咡',
+  '��' => '咭',
+  '��' => '咥',
+  '��' => '哏',
+  '�@' => '哃',
+  '�A' => '茍',
+  '�B' => '咷',
+  '�C' => '咮',
+  '�D' => '哖',
+  '�E' => '咶',
+  '�F' => '哅',
+  '�G' => '哆',
+  '�H' => '咠',
+  '�I' => '呰',
+  '�J' => '咼',
+  '�K' => '咢',
+  '�L' => '咾',
+  '�M' => '呲',
+  '�N' => '哞',
+  '�O' => '咰',
+  '�P' => '垵',
+  '�Q' => '垞',
+  '�R' => '垟',
+  '�S' => '垤',
+  '�T' => '垌',
+  '�U' => '垗',
+  '�V' => '垝',
+  '�W' => '垛',
+  '�X' => '垔',
+  '�Y' => '垘',
+  '�Z' => '垏',
+  '�[' => '垙',
+  '�\\' => '垥',
+  '�]' => '垚',
+  '�^' => '垕',
+  '�_' => '壴',
+  '�`' => '复',
+  '�a' => '奓',
+  '�b' => '姡',
+  '�c' => '姞',
+  '�d' => '姮',
+  '�e' => '娀',
+  '�f' => '姱',
+  '�g' => '姝',
+  '�h' => '姺',
+  '�i' => '姽',
+  '�j' => '姼',
+  '�k' => '姶',
+  '�l' => '姤',
+  '�m' => '姲',
+  '�n' => '姷',
+  '�o' => '姛',
+  '�p' => '姩',
+  '�q' => '姳',
+  '�r' => '姵',
+  '�s' => '姠',
+  '�t' => '姾',
+  '�u' => '姴',
+  '�v' => '姭',
+  '�w' => '宨',
+  '�x' => '屌',
+  '�y' => '峐',
+  '�z' => '峘',
+  '�{' => '峌',
+  '�|' => '峗',
+  '�}' => '峋',
+  '�~' => '峛',
+  'Ρ' => '峞',
+  '΢' => '峚',
+  'Σ' => '峉',
+  'Τ' => '峇',
+  'Υ' => '峊',
+  'Φ' => '峖',
+  'Χ' => '峓',
+  'Ψ' => '峔',
+  'Ω' => '峏',
+  'Ϊ' => '峈',
+  'Ϋ' => '峆',
+  'ά' => '峎',
+  'έ' => '峟',
+  'ή' => '峸',
+  'ί' => '巹',
+  'ΰ' => '帡',
+  'α' => '帢',
+  'β' => '帣',
+  'γ' => '帠',
+  'δ' => '帤',
+  'ε' => '庰',
+  'ζ' => '庤',
+  'η' => '庢',
+  'θ' => '庛',
+  'ι' => '庣',
+  'κ' => '庥',
+  'λ' => '弇',
+  'μ' => '弮',
+  'ν' => '彖',
+  'ξ' => '徆',
+  'ο' => '怷',
+  '��' => '怹',
+  '��' => '恔',
+  '��' => '恲',
+  '��' => '恞',
+  '��' => '恅',
+  '��' => '恓',
+  '��' => '恇',
+  '��' => '恉',
+  '��' => '恛',
+  '��' => '恌',
+  '��' => '恀',
+  '��' => '恂',
+  '��' => '恟',
+  '��' => '怤',
+  '��' => '恄',
+  '��' => '恘',
+  '��' => '恦',
+  '��' => '恮',
+  '��' => '扂',
+  '��' => '扃',
+  '��' => '拏',
+  '��' => '挍',
+  '��' => '挋',
+  '��' => '拵',
+  '��' => '挎',
+  '��' => '挃',
+  '��' => '拫',
+  '��' => '拹',
+  '��' => '挏',
+  '��' => '挌',
+  '��' => '拸',
+  '��' => '拶',
+  '��' => '挀',
+  '��' => '挓',
+  '��' => '挔',
+  '��' => '拺',
+  '��' => '挕',
+  '��' => '拻',
+  '��' => '拰',
+  '��' => '敁',
+  '��' => '敃',
+  '��' => '斪',
+  '��' => '斿',
+  '��' => '昶',
+  '��' => '昡',
+  '��' => '昲',
+  '��' => '昵',
+  '��' => '昜',
+  '��' => '昦',
+  '��' => '昢',
+  '��' => '昳',
+  '��' => '昫',
+  '��' => '昺',
+  '��' => '昝',
+  '��' => '昴',
+  '��' => '昹',
+  '��' => '昮',
+  '��' => '朏',
+  '��' => '朐',
+  '��' => '柁',
+  '��' => '柲',
+  '��' => '柈',
+  '��' => '枺',
+  '�@' => '柜',
+  '�A' => '枻',
+  '�B' => '柸',
+  '�C' => '柘',
+  '�D' => '柀',
+  '�E' => '枷',
+  '�F' => '柅',
+  '�G' => '柫',
+  '�H' => '柤',
+  '�I' => '柟',
+  '�J' => '枵',
+  '�K' => '柍',
+  '�L' => '枳',
+  '�M' => '柷',
+  '�N' => '柶',
+  '�O' => '柮',
+  '�P' => '柣',
+  '�Q' => '柂',
+  '�R' => '枹',
+  '�S' => '柎',
+  '�T' => '柧',
+  '�U' => '柰',
+  '�V' => '枲',
+  '�W' => '柼',
+  '�X' => '柆',
+  '�Y' => '柭',
+  '�Z' => '柌',
+  '�[' => '枮',
+  '�\\' => '柦',
+  '�]' => '柛',
+  '�^' => '柺',
+  '�_' => '柉',
+  '�`' => '柊',
+  '�a' => '柃',
+  '�b' => '柪',
+  '�c' => '柋',
+  '�d' => '欨',
+  '�e' => '殂',
+  '�f' => '殄',
+  '�g' => '殶',
+  '�h' => '毖',
+  '�i' => '毘',
+  '�j' => '毠',
+  '�k' => '氠',
+  '�l' => '氡',
+  '�m' => '洨',
+  '�n' => '洴',
+  '�o' => '洭',
+  '�p' => '洟',
+  '�q' => '洼',
+  '�r' => '洿',
+  '�s' => '洒',
+  '�t' => '洊',
+  '�u' => '泚',
+  '�v' => '洳',
+  '�w' => '洄',
+  '�x' => '洙',
+  '�y' => '洺',
+  '�z' => '洚',
+  '�{' => '洑',
+  '�|' => '洀',
+  '�}' => '洝',
+  '�~' => '浂',
+  'ϡ' => '洁',
+  'Ϣ' => '洘',
+  'ϣ' => '洷',
+  'Ϥ' => '洃',
+  'ϥ' => '洏',
+  'Ϧ' => '浀',
+  'ϧ' => '洇',
+  'Ϩ' => '洠',
+  'ϩ' => '洬',
+  'Ϫ' => '洈',
+  'ϫ' => '洢',
+  'Ϭ' => '洉',
+  'ϭ' => '洐',
+  'Ϯ' => '炷',
+  'ϯ' => '炟',
+  'ϰ' => '炾',
+  'ϱ' => '炱',
+  'ϲ' => '炰',
+  'ϳ' => '炡',
+  'ϴ' => '炴',
+  'ϵ' => '炵',
+  '϶' => '炩',
+  'Ϸ' => '牁',
+  'ϸ' => '牉',
+  'Ϲ' => '牊',
+  'Ϻ' => '牬',
+  'ϻ' => '牰',
+  'ϼ' => '牳',
+  'Ͻ' => '牮',
+  'Ͼ' => '狊',
+  'Ͽ' => '狤',
+  '��' => '狨',
+  '��' => '狫',
+  '��' => '狟',
+  '��' => '狪',
+  '��' => '狦',
+  '��' => '狣',
+  '��' => '玅',
+  '��' => '珌',
+  '��' => '珂',
+  '��' => '珈',
+  '��' => '珅',
+  '��' => '玹',
+  '��' => '玶',
+  '��' => '玵',
+  '��' => '玴',
+  '��' => '珫',
+  '��' => '玿',
+  '��' => '珇',
+  '��' => '玾',
+  '��' => '珃',
+  '��' => '珆',
+  '��' => '玸',
+  '��' => '珋',
+  '��' => '瓬',
+  '��' => '瓮',
+  '��' => '甮',
+  '��' => '畇',
+  '��' => '畈',
+  '��' => '疧',
+  '��' => '疪',
+  '��' => '癹',
+  '��' => '盄',
+  '��' => '眈',
+  '��' => '眃',
+  '��' => '眄',
+  '��' => '眅',
+  '��' => '眊',
+  '��' => '盷',
+  '��' => '盻',
+  '��' => '盺',
+  '��' => '矧',
+  '��' => '矨',
+  '��' => '砆',
+  '��' => '砑',
+  '��' => '砒',
+  '��' => '砅',
+  '��' => '砐',
+  '��' => '砏',
+  '��' => '砎',
+  '��' => '砉',
+  '��' => '砃',
+  '��' => '砓',
+  '��' => '祊',
+  '��' => '祌',
+  '��' => '祋',
+  '��' => '祅',
+  '��' => '祄',
+  '��' => '秕',
+  '��' => '种',
+  '��' => '秏',
+  '��' => '秖',
+  '��' => '秎',
+  '��' => '窀',
+  '�@' => '穾',
+  '�A' => '竑',
+  '�B' => '笀',
+  '�C' => '笁',
+  '�D' => '籺',
+  '�E' => '籸',
+  '�F' => '籹',
+  '�G' => '籿',
+  '�H' => '粀',
+  '�I' => '粁',
+  '�J' => '紃',
+  '�K' => '紈',
+  '�L' => '紁',
+  '�M' => '罘',
+  '�N' => '羑',
+  '�O' => '羍',
+  '�P' => '羾',
+  '�Q' => '耇',
+  '�R' => '耎',
+  '�S' => '耏',
+  '�T' => '耔',
+  '�U' => '耷',
+  '�V' => '胘',
+  '�W' => '胇',
+  '�X' => '胠',
+  '�Y' => '胑',
+  '�Z' => '胈',
+  '�[' => '胂',
+  '�\\' => '胐',
+  '�]' => '胅',
+  '�^' => '胣',
+  '�_' => '胙',
+  '�`' => '胜',
+  '�a' => '胊',
+  '�b' => '胕',
+  '�c' => '胉',
+  '�d' => '胏',
+  '�e' => '胗',
+  '�f' => '胦',
+  '�g' => '胍',
+  '�h' => '臿',
+  '�i' => '舡',
+  '�j' => '芔',
+  '�k' => '苙',
+  '�l' => '苾',
+  '�m' => '苹',
+  '�n' => '茇',
+  '�o' => '苨',
+  '�p' => '茀',
+  '�q' => '苕',
+  '�r' => '茺',
+  '�s' => '苫',
+  '�t' => '苖',
+  '�u' => '苴',
+  '�v' => '苬',
+  '�w' => '苡',
+  '�x' => '苲',
+  '�y' => '苵',
+  '�z' => '茌',
+  '�{' => '苻',
+  '�|' => '苶',
+  '�}' => '苰',
+  '�~' => '苪',
+  'С' => '苤',
+  'Т' => '苠',
+  'У' => '苺',
+  'Ф' => '苳',
+  'Х' => '苭',
+  'Ц' => '虷',
+  'Ч' => '虴',
+  'Ш' => '虼',
+  'Щ' => '虳',
+  'Ъ' => '衁',
+  'Ы' => '衎',
+  'Ь' => '衧',
+  'Э' => '衪',
+  'Ю' => '衩',
+  'Я' => '觓',
+  'а' => '訄',
+  'б' => '訇',
+  'в' => '赲',
+  'г' => '迣',
+  'д' => '迡',
+  'е' => '迮',
+  'ж' => '迠',
+  'з' => '郱',
+  'и' => '邽',
+  'й' => '邿',
+  'к' => '郕',
+  'л' => '郅',
+  'м' => '邾',
+  'н' => '郇',
+  'о' => '郋',
+  'п' => '郈',
+  '��' => '釔',
+  '��' => '釓',
+  '��' => '陔',
+  '��' => '陏',
+  '��' => '陑',
+  '��' => '陓',
+  '��' => '陊',
+  '��' => '陎',
+  '��' => '倞',
+  '��' => '倅',
+  '��' => '倇',
+  '��' => '倓',
+  '��' => '倢',
+  '��' => '倰',
+  '��' => '倛',
+  '��' => '俵',
+  '��' => '俴',
+  '��' => '倳',
+  '��' => '倷',
+  '��' => '倬',
+  '��' => '俶',
+  '��' => '俷',
+  '��' => '倗',
+  '��' => '倜',
+  '��' => '倠',
+  '��' => '倧',
+  '��' => '倵',
+  '��' => '倯',
+  '��' => '倱',
+  '��' => '倎',
+  '��' => '党',
+  '��' => '冔',
+  '��' => '冓',
+  '��' => '凊',
+  '��' => '凄',
+  '��' => '凅',
+  '��' => '凈',
+  '��' => '凎',
+  '��' => '剡',
+  '��' => '剚',
+  '��' => '剒',
+  '��' => '剞',
+  '��' => '剟',
+  '��' => '剕',
+  '��' => '剢',
+  '��' => '勍',
+  '��' => '匎',
+  '��' => '厞',
+  '��' => '唦',
+  '��' => '哢',
+  '��' => '唗',
+  '��' => '唒',
+  '��' => '哧',
+  '��' => '哳',
+  '��' => '哤',
+  '��' => '唚',
+  '��' => '哿',
+  '��' => '唄',
+  '��' => '唈',
+  '��' => '哫',
+  '��' => '唑',
+  '��' => '唅',
+  '��' => '哱',
+  '�@' => '唊',
+  '�A' => '哻',
+  '�B' => '哷',
+  '�C' => '哸',
+  '�D' => '哠',
+  '�E' => '唎',
+  '�F' => '唃',
+  '�G' => '唋',
+  '�H' => '圁',
+  '�I' => '圂',
+  '�J' => '埌',
+  '�K' => '堲',
+  '�L' => '埕',
+  '�M' => '埒',
+  '�N' => '垺',
+  '�O' => '埆',
+  '�P' => '垽',
+  '�Q' => '垼',
+  '�R' => '垸',
+  '�S' => '垶',
+  '�T' => '垿',
+  '�U' => '埇',
+  '�V' => '埐',
+  '�W' => '垹',
+  '�X' => '埁',
+  '�Y' => '夎',
+  '�Z' => '奊',
+  '�[' => '娙',
+  '�\\' => '娖',
+  '�]' => '娭',
+  '�^' => '娮',
+  '�_' => '娕',
+  '�`' => '娏',
+  '�a' => '娗',
+  '�b' => '娊',
+  '�c' => '娞',
+  '�d' => '娳',
+  '�e' => '孬',
+  '�f' => '宧',
+  '�g' => '宭',
+  '�h' => '宬',
+  '�i' => '尃',
+  '�j' => '屖',
+  '�k' => '屔',
+  '�l' => '峬',
+  '�m' => '峿',
+  '�n' => '峮',
+  '�o' => '峱',
+  '�p' => '峷',
+  '�q' => '崀',
+  '�r' => '峹',
+  '�s' => '帩',
+  '�t' => '帨',
+  '�u' => '庨',
+  '�v' => '庮',
+  '�w' => '庪',
+  '�x' => '庬',
+  '�y' => '弳',
+  '�z' => '弰',
+  '�{' => '彧',
+  '�|' => '恝',
+  '�}' => '恚',
+  '�~' => '恧',
+  'ѡ' => '恁',
+  'Ѣ' => '悢',
+  'ѣ' => '悈',
+  'Ѥ' => '悀',
+  'ѥ' => '悒',
+  'Ѧ' => '悁',
+  'ѧ' => '悝',
+  'Ѩ' => '悃',
+  'ѩ' => '悕',
+  'Ѫ' => '悛',
+  'ѫ' => '悗',
+  'Ѭ' => '悇',
+  'ѭ' => '悜',
+  'Ѯ' => '悎',
+  'ѯ' => '戙',
+  'Ѱ' => '扆',
+  'ѱ' => '拲',
+  'Ѳ' => '挐',
+  'ѳ' => '捖',
+  'Ѵ' => '挬',
+  'ѵ' => '捄',
+  'Ѷ' => '捅',
+  'ѷ' => '挶',
+  'Ѹ' => '捃',
+  'ѹ' => '揤',
+  'Ѻ' => '挹',
+  'ѻ' => '捋',
+  'Ѽ' => '捊',
+  'ѽ' => '挼',
+  'Ѿ' => '挩',
+  'ѿ' => '捁',
+  '��' => '挴',
+  '��' => '捘',
+  '��' => '捔',
+  '��' => '捙',
+  '��' => '挭',
+  '��' => '捇',
+  '��' => '挳',
+  '��' => '捚',
+  '��' => '捑',
+  '��' => '挸',
+  '��' => '捗',
+  '��' => '捀',
+  '��' => '捈',
+  '��' => '敊',
+  '��' => '敆',
+  '��' => '旆',
+  '��' => '旃',
+  '��' => '旄',
+  '��' => '旂',
+  '��' => '晊',
+  '��' => '晟',
+  '��' => '晇',
+  '��' => '晑',
+  '��' => '朒',
+  '��' => '朓',
+  '��' => '栟',
+  '��' => '栚',
+  '��' => '桉',
+  '��' => '栲',
+  '��' => '栳',
+  '��' => '栻',
+  '��' => '桋',
+  '��' => '桏',
+  '��' => '栖',
+  '��' => '栱',
+  '��' => '栜',
+  '��' => '栵',
+  '��' => '栫',
+  '��' => '栭',
+  '��' => '栯',
+  '��' => '桎',
+  '��' => '桄',
+  '��' => '栴',
+  '��' => '栝',
+  '��' => '栒',
+  '��' => '栔',
+  '��' => '栦',
+  '��' => '栨',
+  '��' => '栮',
+  '��' => '桍',
+  '��' => '栺',
+  '��' => '栥',
+  '��' => '栠',
+  '��' => '欬',
+  '��' => '欯',
+  '��' => '欭',
+  '��' => '欱',
+  '��' => '欴',
+  '��' => '歭',
+  '��' => '肂',
+  '��' => '殈',
+  '��' => '毦',
+  '��' => '毤',
+  '�@' => '毨',
+  '�A' => '毣',
+  '�B' => '毢',
+  '�C' => '毧',
+  '�D' => '氥',
+  '�E' => '浺',
+  '�F' => '浣',
+  '�G' => '浤',
+  '�H' => '浶',
+  '�I' => '洍',
+  '�J' => '浡',
+  '�K' => '涒',
+  '�L' => '浘',
+  '�M' => '浢',
+  '�N' => '浭',
+  '�O' => '浯',
+  '�P' => '涑',
+  '�Q' => '涍',
+  '�R' => '淯',
+  '�S' => '浿',
+  '�T' => '涆',
+  '�U' => '浞',
+  '�V' => '浧',
+  '�W' => '浠',
+  '�X' => '涗',
+  '�Y' => '浰',
+  '�Z' => '浼',
+  '�[' => '浟',
+  '�\\' => '涂',
+  '�]' => '涘',
+  '�^' => '洯',
+  '�_' => '浨',
+  '�`' => '涋',
+  '�a' => '浾',
+  '�b' => '涀',
+  '�c' => '涄',
+  '�d' => '洖',
+  '�e' => '涃',
+  '�f' => '浻',
+  '�g' => '浽',
+  '�h' => '浵',
+  '�i' => '涐',
+  '�j' => '烜',
+  '�k' => '烓',
+  '�l' => '烑',
+  '�m' => '烝',
+  '�n' => '烋',
+  '�o' => '缹',
+  '�p' => '烢',
+  '�q' => '烗',
+  '�r' => '烒',
+  '�s' => '烞',
+  '�t' => '烠',
+  '�u' => '烔',
+  '�v' => '烍',
+  '�w' => '烅',
+  '�x' => '烆',
+  '�y' => '烇',
+  '�z' => '烚',
+  '�{' => '烎',
+  '�|' => '烡',
+  '�}' => '牂',
+  '�~' => '牸',
+  'ҡ' => '牷',
+  'Ң' => '牶',
+  'ң' => '猀',
+  'Ҥ' => '狺',
+  'ҥ' => '狴',
+  'Ҧ' => '狾',
+  'ҧ' => '狶',
+  'Ҩ' => '狳',
+  'ҩ' => '狻',
+  'Ҫ' => '猁',
+  'ҫ' => '珓',
+  'Ҭ' => '珙',
+  'ҭ' => '珥',
+  'Ү' => '珖',
+  'ү' => '玼',
+  'Ұ' => '珧',
+  'ұ' => '珣',
+  'Ҳ' => '珩',
+  'ҳ' => '珜',
+  'Ҵ' => '珒',
+  'ҵ' => '珛',
+  'Ҷ' => '珔',
+  'ҷ' => '珝',
+  'Ҹ' => '珚',
+  'ҹ' => '珗',
+  'Һ' => '珘',
+  'һ' => '珨',
+  'Ҽ' => '瓞',
+  'ҽ' => '瓟',
+  'Ҿ' => '瓴',
+  'ҿ' => '瓵',
+  '��' => '甡',
+  '��' => '畛',
+  '��' => '畟',
+  '��' => '疰',
+  '��' => '痁',
+  '��' => '疻',
+  '��' => '痄',
+  '��' => '痀',
+  '��' => '疿',
+  '��' => '疶',
+  '��' => '疺',
+  '��' => '皊',
+  '��' => '盉',
+  '��' => '眝',
+  '��' => '眛',
+  '��' => '眐',
+  '��' => '眓',
+  '��' => '眒',
+  '��' => '眣',
+  '��' => '眑',
+  '��' => '眕',
+  '��' => '眙',
+  '��' => '眚',
+  '��' => '眢',
+  '��' => '眧',
+  '��' => '砣',
+  '��' => '砬',
+  '��' => '砢',
+  '��' => '砵',
+  '��' => '砯',
+  '��' => '砨',
+  '��' => '砮',
+  '��' => '砫',
+  '��' => '砡',
+  '��' => '砩',
+  '��' => '砳',
+  '��' => '砪',
+  '��' => '砱',
+  '��' => '祔',
+  '��' => '祛',
+  '��' => '祏',
+  '��' => '祜',
+  '��' => '祓',
+  '��' => '祒',
+  '��' => '祑',
+  '��' => '秫',
+  '��' => '秬',
+  '��' => '秠',
+  '��' => '秮',
+  '��' => '秭',
+  '��' => '秪',
+  '��' => '秜',
+  '��' => '秞',
+  '��' => '秝',
+  '��' => '窆',
+  '��' => '窉',
+  '��' => '窅',
+  '��' => '窋',
+  '��' => '窌',
+  '��' => '窊',
+  '��' => '窇',
+  '��' => '竘',
+  '��' => '笐',
+  '�@' => '笄',
+  '�A' => '笓',
+  '�B' => '笅',
+  '�C' => '笏',
+  '�D' => '笈',
+  '�E' => '笊',
+  '�F' => '笎',
+  '�G' => '笉',
+  '�H' => '笒',
+  '�I' => '粄',
+  '�J' => '粑',
+  '�K' => '粊',
+  '�L' => '粌',
+  '�M' => '粈',
+  '�N' => '粍',
+  '�O' => '粅',
+  '�P' => '紞',
+  '�Q' => '紝',
+  '�R' => '紑',
+  '�S' => '紎',
+  '�T' => '紘',
+  '�U' => '紖',
+  '�V' => '紓',
+  '�W' => '紟',
+  '�X' => '紒',
+  '�Y' => '紏',
+  '�Z' => '紌',
+  '�[' => '罜',
+  '�\\' => '罡',
+  '�]' => '罞',
+  '�^' => '罠',
+  '�_' => '罝',
+  '�`' => '罛',
+  '�a' => '羖',
+  '�b' => '羒',
+  '�c' => '翃',
+  '�d' => '翂',
+  '�e' => '翀',
+  '�f' => '耖',
+  '�g' => '耾',
+  '�h' => '耹',
+  '�i' => '胺',
+  '�j' => '胲',
+  '�k' => '胹',
+  '�l' => '胵',
+  '�m' => '脁',
+  '�n' => '胻',
+  '�o' => '脀',
+  '�p' => '舁',
+  '�q' => '舯',
+  '�r' => '舥',
+  '�s' => '茳',
+  '�t' => '茭',
+  '�u' => '荄',
+  '�v' => '茙',
+  '�w' => '荑',
+  '�x' => '茥',
+  '�y' => '荖',
+  '�z' => '茿',
+  '�{' => '荁',
+  '�|' => '茦',
+  '�}' => '茜',
+  '�~' => '茢',
+  'ӡ' => '荂',
+  'Ӣ' => '荎',
+  'ӣ' => '茛',
+  'Ӥ' => '茪',
+  'ӥ' => '茈',
+  'Ӧ' => '茼',
+  'ӧ' => '荍',
+  'Ө' => '茖',
+  'ө' => '茤',
+  'Ӫ' => '茠',
+  'ӫ' => '茷',
+  'Ӭ' => '茯',
+  'ӭ' => '茩',
+  'Ӯ' => '荇',
+  'ӯ' => '荅',
+  'Ӱ' => '荌',
+  'ӱ' => '荓',
+  'Ӳ' => '茞',
+  'ӳ' => '茬',
+  'Ӵ' => '荋',
+  'ӵ' => '茧',
+  'Ӷ' => '荈',
+  'ӷ' => '虓',
+  'Ӹ' => '虒',
+  'ӹ' => '蚢',
+  'Ӻ' => '蚨',
+  'ӻ' => '蚖',
+  'Ӽ' => '蚍',
+  'ӽ' => '蚑',
+  'Ӿ' => '蚞',
+  'ӿ' => '蚇',
+  '��' => '蚗',
+  '��' => '蚆',
+  '��' => '蚋',
+  '��' => '蚚',
+  '��' => '蚅',
+  '��' => '蚥',
+  '��' => '蚙',
+  '��' => '蚡',
+  '��' => '蚧',
+  '��' => '蚕',
+  '��' => '蚘',
+  '��' => '蚎',
+  '��' => '蚝',
+  '��' => '蚐',
+  '��' => '蚔',
+  '��' => '衃',
+  '��' => '衄',
+  '��' => '衭',
+  '��' => '衵',
+  '��' => '衶',
+  '��' => '衲',
+  '��' => '袀',
+  '��' => '衱',
+  '��' => '衿',
+  '��' => '衯',
+  '��' => '袃',
+  '��' => '衾',
+  '��' => '衴',
+  '��' => '衼',
+  '��' => '訒',
+  '��' => '豇',
+  '��' => '豗',
+  '��' => '豻',
+  '��' => '貤',
+  '��' => '貣',
+  '��' => '赶',
+  '��' => '赸',
+  '��' => '趵',
+  '��' => '趷',
+  '��' => '趶',
+  '��' => '軑',
+  '��' => '軓',
+  '��' => '迾',
+  '��' => '迵',
+  '��' => '适',
+  '��' => '迿',
+  '��' => '迻',
+  '��' => '逄',
+  '��' => '迼',
+  '��' => '迶',
+  '��' => '郖',
+  '��' => '郠',
+  '��' => '郙',
+  '��' => '郚',
+  '��' => '郣',
+  '��' => '郟',
+  '��' => '郥',
+  '��' => '郘',
+  '��' => '郛',
+  '��' => '郗',
+  '��' => '郜',
+  '��' => '郤',
+  '��' => '酐',
+  '�@' => '酎',
+  '�A' => '酏',
+  '�B' => '釕',
+  '�C' => '釢',
+  '�D' => '釚',
+  '�E' => '陜',
+  '�F' => '陟',
+  '�G' => '隼',
+  '�H' => '飣',
+  '�I' => '髟',
+  '�J' => '鬯',
+  '�K' => '乿',
+  '�L' => '偰',
+  '�M' => '偪',
+  '�N' => '偡',
+  '�O' => '偞',
+  '�P' => '偠',
+  '�Q' => '偓',
+  '�R' => '偋',
+  '�S' => '偝',
+  '�T' => '偲',
+  '�U' => '偈',
+  '�V' => '偍',
+  '�W' => '偁',
+  '�X' => '偛',
+  '�Y' => '偊',
+  '�Z' => '偢',
+  '�[' => '倕',
+  '�\\' => '偅',
+  '�]' => '偟',
+  '�^' => '偩',
+  '�_' => '偫',
+  '�`' => '偣',
+  '�a' => '偤',
+  '�b' => '偆',
+  '�c' => '偀',
+  '�d' => '偮',
+  '�e' => '偳',
+  '�f' => '偗',
+  '�g' => '偑',
+  '�h' => '凐',
+  '�i' => '剫',
+  '�j' => '剭',
+  '�k' => '剬',
+  '�l' => '剮',
+  '�m' => '勖',
+  '�n' => '勓',
+  '�o' => '匭',
+  '�p' => '厜',
+  '�q' => '啵',
+  '�r' => '啶',
+  '�s' => '唼',
+  '�t' => '啍',
+  '�u' => '啐',
+  '�v' => '唴',
+  '�w' => '唪',
+  '�x' => '啑',
+  '�y' => '啢',
+  '�z' => '唶',
+  '�{' => '唵',
+  '�|' => '唰',
+  '�}' => '啒',
+  '�~' => '啅',
+  'ԡ' => '唌',
+  'Ԣ' => '唲',
+  'ԣ' => '啥',
+  'Ԥ' => '啎',
+  'ԥ' => '唹',
+  'Ԧ' => '啈',
+  'ԧ' => '唭',
+  'Ԩ' => '唻',
+  'ԩ' => '啀',
+  'Ԫ' => '啋',
+  'ԫ' => '圊',
+  'Ԭ' => '圇',
+  'ԭ' => '埻',
+  'Ԯ' => '堔',
+  'ԯ' => '埢',
+  '԰' => '埶',
+  'Ա' => '埜',
+  'Բ' => '埴',
+  'Գ' => '堀',
+  'Դ' => '埭',
+  'Ե' => '埽',
+  'Զ' => '堈',
+  'Է' => '埸',
+  'Ը' => '堋',
+  'Թ' => '埳',
+  'Ժ' => '埏',
+  'Ի' => '堇',
+  'Լ' => '埮',
+  'Խ' => '埣',
+  'Ծ' => '埲',
+  'Կ' => '埥',
+  '��' => '埬',
+  '��' => '埡',
+  '��' => '堎',
+  '��' => '埼',
+  '��' => '堐',
+  '��' => '埧',
+  '��' => '堁',
+  '��' => '堌',
+  '��' => '埱',
+  '��' => '埩',
+  '��' => '埰',
+  '��' => '堍',
+  '��' => '堄',
+  '��' => '奜',
+  '��' => '婠',
+  '��' => '婘',
+  '��' => '婕',
+  '��' => '婧',
+  '��' => '婞',
+  '��' => '娸',
+  '��' => '娵',
+  '��' => '婭',
+  '��' => '婐',
+  '��' => '婟',
+  '��' => '婥',
+  '��' => '婬',
+  '��' => '婓',
+  '��' => '婤',
+  '��' => '婗',
+  '��' => '婃',
+  '��' => '婝',
+  '��' => '婒',
+  '��' => '婄',
+  '��' => '婛',
+  '��' => '婈',
+  '��' => '媎',
+  '��' => '娾',
+  '��' => '婍',
+  '��' => '娹',
+  '��' => '婌',
+  '��' => '婰',
+  '��' => '婩',
+  '��' => '婇',
+  '��' => '婑',
+  '��' => '婖',
+  '��' => '婂',
+  '��' => '婜',
+  '��' => '孲',
+  '��' => '孮',
+  '��' => '寁',
+  '��' => '寀',
+  '��' => '屙',
+  '��' => '崞',
+  '��' => '崋',
+  '��' => '崝',
+  '��' => '崚',
+  '��' => '崠',
+  '��' => '崌',
+  '��' => '崨',
+  '��' => '崍',
+  '��' => '崦',
+  '��' => '崥',
+  '��' => '崏',
+  '�@' => '崰',
+  '�A' => '崒',
+  '�B' => '崣',
+  '�C' => '崟',
+  '�D' => '崮',
+  '�E' => '帾',
+  '�F' => '帴',
+  '�G' => '庱',
+  '�H' => '庴',
+  '�I' => '庹',
+  '�J' => '庲',
+  '�K' => '庳',
+  '�L' => '弶',
+  '�M' => '弸',
+  '�N' => '徛',
+  '�O' => '徖',
+  '�P' => '徟',
+  '�Q' => '悊',
+  '�R' => '悐',
+  '�S' => '悆',
+  '�T' => '悾',
+  '�U' => '悰',
+  '�V' => '悺',
+  '�W' => '惓',
+  '�X' => '惔',
+  '�Y' => '惏',
+  '�Z' => '惤',
+  '�[' => '惙',
+  '�\\' => '惝',
+  '�]' => '惈',
+  '�^' => '悱',
+  '�_' => '惛',
+  '�`' => '悷',
+  '�a' => '惊',
+  '�b' => '悿',
+  '�c' => '惃',
+  '�d' => '惍',
+  '�e' => '惀',
+  '�f' => '挲',
+  '�g' => '捥',
+  '�h' => '掊',
+  '�i' => '掂',
+  '�j' => '捽',
+  '�k' => '掽',
+  '�l' => '掞',
+  '�m' => '掭',
+  '�n' => '掝',
+  '�o' => '掗',
+  '�p' => '掫',
+  '�q' => '掎',
+  '�r' => '捯',
+  '�s' => '掇',
+  '�t' => '掐',
+  '�u' => '据',
+  '�v' => '掯',
+  '�w' => '捵',
+  '�x' => '掜',
+  '�y' => '捭',
+  '�z' => '掮',
+  '�{' => '捼',
+  '�|' => '掤',
+  '�}' => '挻',
+  '�~' => '掟',
+  'ա' => '捸',
+  'բ' => '掅',
+  'գ' => '掁',
+  'դ' => '掑',
+  'ե' => '掍',
+  'զ' => '捰',
+  'է' => '敓',
+  'ը' => '旍',
+  'թ' => '晥',
+  'ժ' => '晡',
+  'ի' => '晛',
+  'լ' => '晙',
+  'խ' => '晜',
+  'ծ' => '晢',
+  'կ' => '朘',
+  'հ' => '桹',
+  'ձ' => '梇',
+  'ղ' => '梐',
+  'ճ' => '梜',
+  'մ' => '桭',
+  'յ' => '桮',
+  'ն' => '梮',
+  'շ' => '梫',
+  'ո' => '楖',
+  'չ' => '桯',
+  'պ' => '梣',
+  'ջ' => '梬',
+  'ռ' => '梩',
+  'ս' => '桵',
+  'վ' => '桴',
+  'տ' => '梲',
+  '��' => '梏',
+  '��' => '桷',
+  '��' => '梒',
+  '��' => '桼',
+  '��' => '桫',
+  '��' => '桲',
+  '��' => '梪',
+  '��' => '梀',
+  '��' => '桱',
+  '��' => '桾',
+  '��' => '梛',
+  '��' => '梖',
+  '��' => '梋',
+  '��' => '梠',
+  '��' => '梉',
+  '��' => '梤',
+  '��' => '桸',
+  '��' => '桻',
+  '��' => '梑',
+  '��' => '梌',
+  '��' => '梊',
+  '��' => '桽',
+  '��' => '欶',
+  '��' => '欳',
+  '��' => '欷',
+  '��' => '欸',
+  '��' => '殑',
+  '��' => '殏',
+  '��' => '殍',
+  '��' => '殎',
+  '��' => '殌',
+  '��' => '氪',
+  '��' => '淀',
+  '��' => '涫',
+  '��' => '涴',
+  '��' => '涳',
+  '��' => '湴',
+  '��' => '涬',
+  '��' => '淩',
+  '��' => '淢',
+  '��' => '涷',
+  '��' => '淶',
+  '��' => '淔',
+  '��' => '渀',
+  '��' => '淈',
+  '��' => '淠',
+  '��' => '淟',
+  '��' => '淖',
+  '��' => '涾',
+  '��' => '淥',
+  '��' => '淜',
+  '��' => '淝',
+  '��' => '淛',
+  '��' => '淴',
+  '��' => '淊',
+  '��' => '涽',
+  '��' => '淭',
+  '��' => '淰',
+  '��' => '涺',
+  '��' => '淕',
+  '��' => '淂',
+  '��' => '淏',
+  '��' => '淉',
+  '�@' => '淐',
+  '�A' => '淲',
+  '�B' => '淓',
+  '�C' => '淽',
+  '�D' => '淗',
+  '�E' => '淍',
+  '�F' => '淣',
+  '�G' => '涻',
+  '�H' => '烺',
+  '�I' => '焍',
+  '�J' => '烷',
+  '�K' => '焗',
+  '�L' => '烴',
+  '�M' => '焌',
+  '�N' => '烰',
+  '�O' => '焄',
+  '�P' => '烳',
+  '�Q' => '焐',
+  '�R' => '烼',
+  '�S' => '烿',
+  '�T' => '焆',
+  '�U' => '焓',
+  '�V' => '焀',
+  '�W' => '烸',
+  '�X' => '烶',
+  '�Y' => '焋',
+  '�Z' => '焂',
+  '�[' => '焎',
+  '�\\' => '牾',
+  '�]' => '牻',
+  '�^' => '牼',
+  '�_' => '牿',
+  '�`' => '猝',
+  '�a' => '猗',
+  '�b' => '猇',
+  '�c' => '猑',
+  '�d' => '猘',
+  '�e' => '猊',
+  '�f' => '猈',
+  '�g' => '狿',
+  '�h' => '猏',
+  '�i' => '猞',
+  '�j' => '玈',
+  '�k' => '珶',
+  '�l' => '珸',
+  '�m' => '珵',
+  '�n' => '琄',
+  '�o' => '琁',
+  '�p' => '珽',
+  '�q' => '琇',
+  '�r' => '琀',
+  '�s' => '珺',
+  '�t' => '珼',
+  '�u' => '珿',
+  '�v' => '琌',
+  '�w' => '琋',
+  '�x' => '珴',
+  '�y' => '琈',
+  '�z' => '畤',
+  '�{' => '畣',
+  '�|' => '痎',
+  '�}' => '痒',
+  '�~' => '痏',
+  '֡' => '痋',
+  '֢' => '痌',
+  '֣' => '痑',
+  '֤' => '痐',
+  '֥' => '皏',
+  '֦' => '皉',
+  '֧' => '盓',
+  '֨' => '眹',
+  '֩' => '眯',
+  '֪' => '眭',
+  '֫' => '眱',
+  '֬' => '眲',
+  '֭' => '眴',
+  '֮' => '眳',
+  '֯' => '眽',
+  'ְ' => '眥',
+  'ֱ' => '眻',
+  'ֲ' => '眵',
+  'ֳ' => '硈',
+  'ִ' => '硒',
+  'ֵ' => '硉',
+  'ֶ' => '硍',
+  'ַ' => '硊',
+  'ָ' => '硌',
+  'ֹ' => '砦',
+  'ֺ' => '硅',
+  'ֻ' => '硐',
+  'ּ' => '祤',
+  'ֽ' => '祧',
+  '־' => '祩',
+  'ֿ' => '祪',
+  '��' => '祣',
+  '��' => '祫',
+  '��' => '祡',
+  '��' => '离',
+  '��' => '秺',
+  '��' => '秸',
+  '��' => '秶',
+  '��' => '秷',
+  '��' => '窏',
+  '��' => '窔',
+  '��' => '窐',
+  '��' => '笵',
+  '��' => '筇',
+  '��' => '笴',
+  '��' => '笥',
+  '��' => '笰',
+  '��' => '笢',
+  '��' => '笤',
+  '��' => '笳',
+  '��' => '笘',
+  '��' => '笪',
+  '��' => '笝',
+  '��' => '笱',
+  '��' => '笫',
+  '��' => '笭',
+  '��' => '笯',
+  '��' => '笲',
+  '��' => '笸',
+  '��' => '笚',
+  '��' => '笣',
+  '��' => '粔',
+  '��' => '粘',
+  '��' => '粖',
+  '��' => '粣',
+  '��' => '紵',
+  '��' => '紽',
+  '��' => '紸',
+  '��' => '紶',
+  '��' => '紺',
+  '��' => '絅',
+  '��' => '紬',
+  '��' => '紩',
+  '��' => '絁',
+  '��' => '絇',
+  '��' => '紾',
+  '��' => '紿',
+  '��' => '絊',
+  '��' => '紻',
+  '��' => '紨',
+  '��' => '罣',
+  '��' => '羕',
+  '��' => '羜',
+  '��' => '羝',
+  '��' => '羛',
+  '��' => '翊',
+  '��' => '翋',
+  '��' => '翍',
+  '��' => '翐',
+  '��' => '翑',
+  '��' => '翇',
+  '��' => '翏',
+  '��' => '翉',
+  '��' => '耟',
+  '�@' => '耞',
+  '�A' => '耛',
+  '�B' => '聇',
+  '�C' => '聃',
+  '�D' => '聈',
+  '�E' => '脘',
+  '�F' => '脥',
+  '�G' => '脙',
+  '�H' => '脛',
+  '�I' => '脭',
+  '�J' => '脟',
+  '�K' => '脬',
+  '�L' => '脞',
+  '�M' => '脡',
+  '�N' => '脕',
+  '�O' => '脧',
+  '�P' => '脝',
+  '�Q' => '脢',
+  '�R' => '舑',
+  '�S' => '舸',
+  '�T' => '舳',
+  '�U' => '舺',
+  '�V' => '舴',
+  '�W' => '舲',
+  '�X' => '艴',
+  '�Y' => '莐',
+  '�Z' => '莣',
+  '�[' => '莨',
+  '�\\' => '莍',
+  '�]' => '荺',
+  '�^' => '荳',
+  '�_' => '莤',
+  '�`' => '荴',
+  '�a' => '莏',
+  '�b' => '莁',
+  '�c' => '莕',
+  '�d' => '莙',
+  '�e' => '荵',
+  '�f' => '莔',
+  '�g' => '莩',
+  '�h' => '荽',
+  '�i' => '莃',
+  '�j' => '莌',
+  '�k' => '莝',
+  '�l' => '莛',
+  '�m' => '莪',
+  '�n' => '莋',
+  '�o' => '荾',
+  '�p' => '莥',
+  '�q' => '莯',
+  '�r' => '莈',
+  '�s' => '莗',
+  '�t' => '莰',
+  '�u' => '荿',
+  '�v' => '莦',
+  '�w' => '莇',
+  '�x' => '莮',
+  '�y' => '荶',
+  '�z' => '莚',
+  '�{' => '虙',
+  '�|' => '虖',
+  '�}' => '蚿',
+  '�~' => '蚷',
+  'ס' => '蛂',
+  'ע' => '蛁',
+  'ף' => '蛅',
+  'פ' => '蚺',
+  'ץ' => '蚰',
+  'צ' => '蛈',
+  'ק' => '蚹',
+  'ר' => '蚳',
+  'ש' => '蚸',
+  'ת' => '蛌',
+  '׫' => '蚴',
+  '׬' => '蚻',
+  '׭' => '蚼',
+  '׮' => '蛃',
+  'ׯ' => '蚽',
+  'װ' => '蚾',
+  'ױ' => '衒',
+  'ײ' => '袉',
+  '׳' => '袕',
+  '״' => '袨',
+  '׵' => '袢',
+  '׶' => '袪',
+  '׷' => '袚',
+  '׸' => '袑',
+  '׹' => '袡',
+  '׺' => '袟',
+  '׻' => '袘',
+  '׼' => '袧',
+  '׽' => '袙',
+  '׾' => '袛',
+  '׿' => '袗',
+  '��' => '袤',
+  '��' => '袬',
+  '��' => '袌',
+  '��' => '袓',
+  '��' => '袎',
+  '��' => '覂',
+  '��' => '觖',
+  '��' => '觙',
+  '��' => '觕',
+  '��' => '訰',
+  '��' => '訧',
+  '��' => '訬',
+  '��' => '訞',
+  '��' => '谹',
+  '��' => '谻',
+  '��' => '豜',
+  '��' => '豝',
+  '��' => '豽',
+  '��' => '貥',
+  '��' => '赽',
+  '��' => '赻',
+  '��' => '赹',
+  '��' => '趼',
+  '��' => '跂',
+  '��' => '趹',
+  '��' => '趿',
+  '��' => '跁',
+  '��' => '軘',
+  '��' => '軞',
+  '��' => '軝',
+  '��' => '軜',
+  '��' => '軗',
+  '��' => '軠',
+  '��' => '軡',
+  '��' => '逤',
+  '��' => '逋',
+  '��' => '逑',
+  '��' => '逜',
+  '��' => '逌',
+  '��' => '逡',
+  '��' => '郯',
+  '��' => '郪',
+  '��' => '郰',
+  '��' => '郴',
+  '��' => '郲',
+  '��' => '郳',
+  '��' => '郔',
+  '��' => '郫',
+  '��' => '郬',
+  '��' => '郩',
+  '��' => '酖',
+  '��' => '酘',
+  '��' => '酚',
+  '��' => '酓',
+  '��' => '酕',
+  '��' => '釬',
+  '��' => '釴',
+  '��' => '釱',
+  '��' => '釳',
+  '��' => '釸',
+  '��' => '釤',
+  '��' => '釹',
+  '��' => '釪',
+  '�@' => '釫',
+  '�A' => '釷',
+  '�B' => '釨',
+  '�C' => '釮',
+  '�D' => '镺',
+  '�E' => '閆',
+  '�F' => '閈',
+  '�G' => '陼',
+  '�H' => '陭',
+  '�I' => '陫',
+  '�J' => '陱',
+  '�K' => '陯',
+  '�L' => '隿',
+  '�M' => '靪',
+  '�N' => '頄',
+  '�O' => '飥',
+  '�P' => '馗',
+  '�Q' => '傛',
+  '�R' => '傕',
+  '�S' => '傔',
+  '�T' => '傞',
+  '�U' => '傋',
+  '�V' => '傣',
+  '�W' => '傃',
+  '�X' => '傌',
+  '�Y' => '傎',
+  '�Z' => '傝',
+  '�[' => '偨',
+  '�\\' => '傜',
+  '�]' => '傒',
+  '�^' => '傂',
+  '�_' => '傇',
+  '�`' => '兟',
+  '�a' => '凔',
+  '�b' => '匒',
+  '�c' => '匑',
+  '�d' => '厤',
+  '�e' => '厧',
+  '�f' => '喑',
+  '�g' => '喨',
+  '�h' => '喥',
+  '�i' => '喭',
+  '�j' => '啷',
+  '�k' => '噅',
+  '�l' => '喢',
+  '�m' => '喓',
+  '�n' => '喈',
+  '�o' => '喏',
+  '�p' => '喵',
+  '�q' => '喁',
+  '�r' => '喣',
+  '�s' => '喒',
+  '�t' => '喤',
+  '�u' => '啽',
+  '�v' => '喌',
+  '�w' => '喦',
+  '�x' => '啿',
+  '�y' => '喕',
+  '�z' => '喡',
+  '�{' => '喎',
+  '�|' => '圌',
+  '�}' => '堩',
+  '�~' => '堷',
+  'ء' => '堙',
+  'آ' => '堞',
+  'أ' => '堧',
+  'ؤ' => '堣',
+  'إ' => '堨',
+  'ئ' => '埵',
+  'ا' => '塈',
+  'ب' => '堥',
+  'ة' => '堜',
+  'ت' => '堛',
+  'ث' => '堳',
+  'ج' => '堿',
+  'ح' => '堶',
+  'خ' => '堮',
+  'د' => '堹',
+  'ذ' => '堸',
+  'ر' => '堭',
+  'ز' => '堬',
+  'س' => '堻',
+  'ش' => '奡',
+  'ص' => '媯',
+  'ض' => '媔',
+  'ط' => '媟',
+  'ظ' => '婺',
+  'ع' => '媢',
+  'غ' => '媞',
+  'ػ' => '婸',
+  'ؼ' => '媦',
+  'ؽ' => '婼',
+  'ؾ' => '媥',
+  'ؿ' => '媬',
+  '��' => '媕',
+  '��' => '媮',
+  '��' => '娷',
+  '��' => '媄',
+  '��' => '媊',
+  '��' => '媗',
+  '��' => '媃',
+  '��' => '媋',
+  '��' => '媩',
+  '��' => '婻',
+  '��' => '婽',
+  '��' => '媌',
+  '��' => '媜',
+  '��' => '媏',
+  '��' => '媓',
+  '��' => '媝',
+  '��' => '寪',
+  '��' => '寍',
+  '��' => '寋',
+  '��' => '寔',
+  '��' => '寑',
+  '��' => '寊',
+  '��' => '寎',
+  '��' => '尌',
+  '��' => '尰',
+  '��' => '崷',
+  '��' => '嵃',
+  '��' => '嵫',
+  '��' => '嵁',
+  '��' => '嵋',
+  '��' => '崿',
+  '��' => '崵',
+  '��' => '嵑',
+  '��' => '嵎',
+  '��' => '嵕',
+  '��' => '崳',
+  '��' => '崺',
+  '��' => '嵒',
+  '��' => '崽',
+  '��' => '崱',
+  '��' => '嵙',
+  '��' => '嵂',
+  '��' => '崹',
+  '��' => '嵉',
+  '��' => '崸',
+  '��' => '崼',
+  '��' => '崲',
+  '��' => '崶',
+  '��' => '嵀',
+  '��' => '嵅',
+  '��' => '幄',
+  '��' => '幁',
+  '��' => '彘',
+  '��' => '徦',
+  '��' => '徥',
+  '��' => '徫',
+  '��' => '惉',
+  '��' => '悹',
+  '��' => '惌',
+  '��' => '惢',
+  '��' => '惎',
+  '��' => '惄',
+  '��' => '愔',
+  '�@' => '惲',
+  '�A' => '愊',
+  '�B' => '愖',
+  '�C' => '愅',
+  '�D' => '惵',
+  '�E' => '愓',
+  '�F' => '惸',
+  '�G' => '惼',
+  '�H' => '惾',
+  '�I' => '惁',
+  '�J' => '愃',
+  '�K' => '愘',
+  '�L' => '愝',
+  '�M' => '愐',
+  '�N' => '惿',
+  '�O' => '愄',
+  '�P' => '愋',
+  '�Q' => '扊',
+  '�R' => '掔',
+  '�S' => '掱',
+  '�T' => '掰',
+  '�U' => '揎',
+  '�V' => '揥',
+  '�W' => '揨',
+  '�X' => '揯',
+  '�Y' => '揃',
+  '�Z' => '撝',
+  '�[' => '揳',
+  '�\\' => '揊',
+  '�]' => '揠',
+  '�^' => '揶',
+  '�_' => '揕',
+  '�`' => '揲',
+  '�a' => '揵',
+  '�b' => '摡',
+  '�c' => '揟',
+  '�d' => '掾',
+  '�e' => '揝',
+  '�f' => '揜',
+  '�g' => '揄',
+  '�h' => '揘',
+  '�i' => '揓',
+  '�j' => '揂',
+  '�k' => '揇',
+  '�l' => '揌',
+  '�m' => '揋',
+  '�n' => '揈',
+  '�o' => '揰',
+  '�p' => '揗',
+  '�q' => '揙',
+  '�r' => '攲',
+  '�s' => '敧',
+  '�t' => '敪',
+  '�u' => '敤',
+  '�v' => '敜',
+  '�w' => '敨',
+  '�x' => '敥',
+  '�y' => '斌',
+  '�z' => '斝',
+  '�{' => '斞',
+  '�|' => '斮',
+  '�}' => '旐',
+  '�~' => '旒',
+  '١' => '晼',
+  '٢' => '晬',
+  '٣' => '晻',
+  '٤' => '暀',
+  '٥' => '晱',
+  '٦' => '晹',
+  '٧' => '晪',
+  '٨' => '晲',
+  '٩' => '朁',
+  '٪' => '椌',
+  '٫' => '棓',
+  '٬' => '椄',
+  '٭' => '棜',
+  'ٮ' => '椪',
+  'ٯ' => '棬',
+  'ٰ' => '棪',
+  'ٱ' => '棱',
+  'ٲ' => '椏',
+  'ٳ' => '棖',
+  'ٴ' => '棷',
+  'ٵ' => '棫',
+  'ٶ' => '棤',
+  'ٷ' => '棶',
+  'ٸ' => '椓',
+  'ٹ' => '椐',
+  'ٺ' => '棳',
+  'ٻ' => '棡',
+  'ټ' => '椇',
+  'ٽ' => '棌',
+  'پ' => '椈',
+  'ٿ' => '楰',
+  '��' => '梴',
+  '��' => '椑',
+  '��' => '棯',
+  '��' => '棆',
+  '��' => '椔',
+  '��' => '棸',
+  '��' => '棐',
+  '��' => '棽',
+  '��' => '棼',
+  '��' => '棨',
+  '��' => '椋',
+  '��' => '椊',
+  '��' => '椗',
+  '��' => '棎',
+  '��' => '棈',
+  '��' => '棝',
+  '��' => '棞',
+  '��' => '棦',
+  '��' => '棴',
+  '��' => '棑',
+  '��' => '椆',
+  '��' => '棔',
+  '��' => '棩',
+  '��' => '椕',
+  '��' => '椥',
+  '��' => '棇',
+  '��' => '欹',
+  '��' => '欻',
+  '��' => '欿',
+  '��' => '欼',
+  '��' => '殔',
+  '��' => '殗',
+  '��' => '殙',
+  '��' => '殕',
+  '��' => '殽',
+  '��' => '毰',
+  '��' => '毲',
+  '��' => '毳',
+  '��' => '氰',
+  '��' => '淼',
+  '��' => '湆',
+  '��' => '湇',
+  '��' => '渟',
+  '��' => '湉',
+  '��' => '溈',
+  '��' => '渼',
+  '��' => '渽',
+  '��' => '湅',
+  '��' => '湢',
+  '��' => '渫',
+  '��' => '渿',
+  '��' => '湁',
+  '��' => '湝',
+  '��' => '湳',
+  '��' => '渜',
+  '��' => '渳',
+  '��' => '湋',
+  '��' => '湀',
+  '��' => '湑',
+  '��' => '渻',
+  '��' => '渃',
+  '��' => '渮',
+  '��' => '湞',
+  '�@' => '湨',
+  '�A' => '湜',
+  '�B' => '湡',
+  '�C' => '渱',
+  '�D' => '渨',
+  '�E' => '湠',
+  '�F' => '湱',
+  '�G' => '湫',
+  '�H' => '渹',
+  '�I' => '渢',
+  '�J' => '渰',
+  '�K' => '湓',
+  '�L' => '湥',
+  '�M' => '渧',
+  '�N' => '湸',
+  '�O' => '湤',
+  '�P' => '湷',
+  '�Q' => '湕',
+  '�R' => '湹',
+  '�S' => '湒',
+  '�T' => '湦',
+  '�U' => '渵',
+  '�V' => '渶',
+  '�W' => '湚',
+  '�X' => '焠',
+  '�Y' => '焞',
+  '�Z' => '焯',
+  '�[' => '烻',
+  '�\\' => '焮',
+  '�]' => '焱',
+  '�^' => '焣',
+  '�_' => '焥',
+  '�`' => '焢',
+  '�a' => '焲',
+  '�b' => '焟',
+  '�c' => '焨',
+  '�d' => '焺',
+  '�e' => '焛',
+  '�f' => '牋',
+  '�g' => '牚',
+  '�h' => '犈',
+  '�i' => '犉',
+  '�j' => '犆',
+  '�k' => '犅',
+  '�l' => '犋',
+  '�m' => '猒',
+  '�n' => '猋',
+  '�o' => '猰',
+  '�p' => '猢',
+  '�q' => '猱',
+  '�r' => '猳',
+  '�s' => '猧',
+  '�t' => '猲',
+  '�u' => '猭',
+  '�v' => '猦',
+  '�w' => '猣',
+  '�x' => '猵',
+  '�y' => '猌',
+  '�z' => '琮',
+  '�{' => '琬',
+  '�|' => '琰',
+  '�}' => '琫',
+  '�~' => '琖',
+  'ڡ' => '琚',
+  'ڢ' => '琡',
+  'ڣ' => '琭',
+  'ڤ' => '琱',
+  'ڥ' => '琤',
+  'ڦ' => '琣',
+  'ڧ' => '琝',
+  'ڨ' => '琩',
+  'ک' => '琠',
+  'ڪ' => '琲',
+  'ګ' => '瓻',
+  'ڬ' => '甯',
+  'ڭ' => '畯',
+  'ڮ' => '畬',
+  'گ' => '痧',
+  'ڰ' => '痚',
+  'ڱ' => '痡',
+  'ڲ' => '痦',
+  'ڳ' => '痝',
+  'ڴ' => '痟',
+  'ڵ' => '痤',
+  'ڶ' => '痗',
+  'ڷ' => '皕',
+  'ڸ' => '皒',
+  'ڹ' => '盚',
+  'ں' => '睆',
+  'ڻ' => '睇',
+  'ڼ' => '睄',
+  'ڽ' => '睍',
+  'ھ' => '睅',
+  'ڿ' => '睊',
+  '��' => '睎',
+  '��' => '睋',
+  '��' => '睌',
+  '��' => '矞',
+  '��' => '矬',
+  '��' => '硠',
+  '��' => '硤',
+  '��' => '硥',
+  '��' => '硜',
+  '��' => '硭',
+  '��' => '硱',
+  '��' => '硪',
+  '��' => '确',
+  '��' => '硰',
+  '��' => '硩',
+  '��' => '硨',
+  '��' => '硞',
+  '��' => '硢',
+  '��' => '祴',
+  '��' => '祳',
+  '��' => '祲',
+  '��' => '祰',
+  '��' => '稂',
+  '��' => '稊',
+  '��' => '稃',
+  '��' => '稌',
+  '��' => '稄',
+  '��' => '窙',
+  '��' => '竦',
+  '��' => '竤',
+  '��' => '筊',
+  '��' => '笻',
+  '��' => '筄',
+  '��' => '筈',
+  '��' => '筌',
+  '��' => '筎',
+  '��' => '筀',
+  '��' => '筘',
+  '��' => '筅',
+  '��' => '粢',
+  '��' => '粞',
+  '��' => '粨',
+  '��' => '粡',
+  '��' => '絘',
+  '��' => '絯',
+  '��' => '絣',
+  '��' => '絓',
+  '��' => '絖',
+  '��' => '絧',
+  '��' => '絪',
+  '��' => '絏',
+  '��' => '絭',
+  '��' => '絜',
+  '��' => '絫',
+  '��' => '絒',
+  '��' => '絔',
+  '��' => '絩',
+  '��' => '絑',
+  '��' => '絟',
+  '��' => '絎',
+  '��' => '缾',
+  '��' => '缿',
+  '��' => '罥',
+  '�@' => '罦',
+  '�A' => '羢',
+  '�B' => '羠',
+  '�C' => '羡',
+  '�D' => '翗',
+  '�E' => '聑',
+  '�F' => '聏',
+  '�G' => '聐',
+  '�H' => '胾',
+  '�I' => '胔',
+  '�J' => '腃',
+  '�K' => '腊',
+  '�L' => '腒',
+  '�M' => '腏',
+  '�N' => '腇',
+  '�O' => '脽',
+  '�P' => '腍',
+  '�Q' => '脺',
+  '�R' => '臦',
+  '�S' => '臮',
+  '�T' => '臷',
+  '�U' => '臸',
+  '�V' => '臹',
+  '�W' => '舄',
+  '�X' => '舼',
+  '�Y' => '舽',
+  '�Z' => '舿',
+  '�[' => '艵',
+  '�\\' => '茻',
+  '�]' => '菏',
+  '�^' => '菹',
+  '�_' => '萣',
+  '�`' => '菀',
+  '�a' => '菨',
+  '�b' => '萒',
+  '�c' => '菧',
+  '�d' => '菤',
+  '�e' => '菼',
+  '�f' => '菶',
+  '�g' => '萐',
+  '�h' => '菆',
+  '�i' => '菈',
+  '�j' => '菫',
+  '�k' => '菣',
+  '�l' => '莿',
+  '�m' => '萁',
+  '�n' => '菝',
+  '�o' => '菥',
+  '�p' => '菘',
+  '�q' => '菿',
+  '�r' => '菡',
+  '�s' => '菋',
+  '�t' => '菎',
+  '�u' => '菖',
+  '�v' => '菵',
+  '�w' => '菉',
+  '�x' => '萉',
+  '�y' => '萏',
+  '�z' => '菞',
+  '�{' => '萑',
+  '�|' => '萆',
+  '�}' => '菂',
+  '�~' => '菳',
+  'ۡ' => '菕',
+  'ۢ' => '菺',
+  'ۣ' => '菇',
+  'ۤ' => '菑',
+  'ۥ' => '菪',
+  'ۦ' => '萓',
+  'ۧ' => '菃',
+  'ۨ' => '菬',
+  '۩' => '菮',
+  '۪' => '菄',
+  '۫' => '菻',
+  '۬' => '菗',
+  'ۭ' => '菢',
+  'ۮ' => '萛',
+  'ۯ' => '菛',
+  '۰' => '菾',
+  '۱' => '蛘',
+  '۲' => '蛢',
+  '۳' => '蛦',
+  '۴' => '蛓',
+  '۵' => '蛣',
+  '۶' => '蛚',
+  '۷' => '蛪',
+  '۸' => '蛝',
+  '۹' => '蛫',
+  'ۺ' => '蛜',
+  'ۻ' => '蛬',
+  'ۼ' => '蛩',
+  '۽' => '蛗',
+  '۾' => '蛨',
+  'ۿ' => '蛑',
+  '��' => '衈',
+  '��' => '衖',
+  '��' => '衕',
+  '��' => '袺',
+  '��' => '裗',
+  '��' => '袹',
+  '��' => '袸',
+  '��' => '裀',
+  '��' => '袾',
+  '��' => '袶',
+  '��' => '袼',
+  '��' => '袷',
+  '��' => '袽',
+  '��' => '袲',
+  '��' => '褁',
+  '��' => '裉',
+  '��' => '覕',
+  '��' => '覘',
+  '��' => '覗',
+  '��' => '觝',
+  '��' => '觚',
+  '��' => '觛',
+  '��' => '詎',
+  '��' => '詍',
+  '��' => '訹',
+  '��' => '詙',
+  '��' => '詀',
+  '��' => '詗',
+  '��' => '詘',
+  '��' => '詄',
+  '��' => '詅',
+  '��' => '詒',
+  '��' => '詈',
+  '��' => '詑',
+  '��' => '詊',
+  '��' => '詌',
+  '��' => '詏',
+  '��' => '豟',
+  '��' => '貁',
+  '��' => '貀',
+  '��' => '貺',
+  '��' => '貾',
+  '��' => '貰',
+  '��' => '貹',
+  '��' => '貵',
+  '��' => '趄',
+  '��' => '趀',
+  '��' => '趉',
+  '��' => '跘',
+  '��' => '跓',
+  '��' => '跍',
+  '��' => '跇',
+  '��' => '跖',
+  '��' => '跜',
+  '��' => '跏',
+  '��' => '跕',
+  '��' => '跙',
+  '��' => '跈',
+  '��' => '跗',
+  '��' => '跅',
+  '��' => '軯',
+  '��' => '軷',
+  '��' => '軺',
+  '�@' => '軹',
+  '�A' => '軦',
+  '�B' => '軮',
+  '�C' => '軥',
+  '�D' => '軵',
+  '�E' => '軧',
+  '�F' => '軨',
+  '�G' => '軶',
+  '�H' => '軫',
+  '�I' => '軱',
+  '�J' => '軬',
+  '�K' => '軴',
+  '�L' => '軩',
+  '�M' => '逭',
+  '�N' => '逴',
+  '�O' => '逯',
+  '�P' => '鄆',
+  '�Q' => '鄬',
+  '�R' => '鄄',
+  '�S' => '郿',
+  '�T' => '郼',
+  '�U' => '鄈',
+  '�V' => '郹',
+  '�W' => '郻',
+  '�X' => '鄁',
+  '�Y' => '鄀',
+  '�Z' => '鄇',
+  '�[' => '鄅',
+  '�\\' => '鄃',
+  '�]' => '酡',
+  '�^' => '酤',
+  '�_' => '酟',
+  '�`' => '酢',
+  '�a' => '酠',
+  '�b' => '鈁',
+  '�c' => '鈊',
+  '�d' => '鈥',
+  '�e' => '鈃',
+  '�f' => '鈚',
+  '�g' => '鈦',
+  '�h' => '鈏',
+  '�i' => '鈌',
+  '�j' => '鈀',
+  '�k' => '鈒',
+  '�l' => '釿',
+  '�m' => '釽',
+  '�n' => '鈆',
+  '�o' => '鈄',
+  '�p' => '鈧',
+  '�q' => '鈂',
+  '�r' => '鈜',
+  '�s' => '鈤',
+  '�t' => '鈙',
+  '�u' => '鈗',
+  '�v' => '鈅',
+  '�w' => '鈖',
+  '�x' => '镻',
+  '�y' => '閍',
+  '�z' => '閌',
+  '�{' => '閐',
+  '�|' => '隇',
+  '�}' => '陾',
+  '�~' => '隈',
+  'ܡ' => '隉',
+  'ܢ' => '隃',
+  'ܣ' => '隀',
+  'ܤ' => '雂',
+  'ܥ' => '雈',
+  'ܦ' => '雃',
+  'ܧ' => '雱',
+  'ܨ' => '雰',
+  'ܩ' => '靬',
+  'ܪ' => '靰',
+  'ܫ' => '靮',
+  'ܬ' => '頇',
+  'ܭ' => '颩',
+  'ܮ' => '飫',
+  'ܯ' => '鳦',
+  'ܰ' => '黹',
+  'ܱ' => '亃',
+  'ܲ' => '亄',
+  'ܳ' => '亶',
+  'ܴ' => '傽',
+  'ܵ' => '傿',
+  'ܶ' => '僆',
+  'ܷ' => '傮',
+  'ܸ' => '僄',
+  'ܹ' => '僊',
+  'ܺ' => '傴',
+  'ܻ' => '僈',
+  'ܼ' => '僂',
+  'ܽ' => '傰',
+  'ܾ' => '僁',
+  'ܿ' => '傺',
+  '��' => '傱',
+  '��' => '僋',
+  '��' => '僉',
+  '��' => '傶',
+  '��' => '傸',
+  '��' => '凗',
+  '��' => '剺',
+  '��' => '剸',
+  '��' => '剻',
+  '��' => '剼',
+  '��' => '嗃',
+  '��' => '嗛',
+  '��' => '嗌',
+  '��' => '嗐',
+  '��' => '嗋',
+  '��' => '嗊',
+  '��' => '嗝',
+  '��' => '嗀',
+  '��' => '嗔',
+  '��' => '嗄',
+  '��' => '嗩',
+  '��' => '喿',
+  '��' => '嗒',
+  '��' => '喍',
+  '��' => '嗏',
+  '��' => '嗕',
+  '��' => '嗢',
+  '��' => '嗖',
+  '��' => '嗈',
+  '��' => '嗲',
+  '��' => '嗍',
+  '��' => '嗙',
+  '��' => '嗂',
+  '��' => '圔',
+  '��' => '塓',
+  '��' => '塨',
+  '��' => '塤',
+  '��' => '塏',
+  '��' => '塍',
+  '��' => '塉',
+  '��' => '塯',
+  '��' => '塕',
+  '��' => '塎',
+  '��' => '塝',
+  '��' => '塙',
+  '��' => '塥',
+  '��' => '塛',
+  '��' => '堽',
+  '��' => '塣',
+  '��' => '塱',
+  '��' => '壼',
+  '��' => '嫇',
+  '��' => '嫄',
+  '��' => '嫋',
+  '��' => '媺',
+  '��' => '媸',
+  '��' => '媱',
+  '��' => '媵',
+  '��' => '媰',
+  '��' => '媿',
+  '��' => '嫈',
+  '��' => '媻',
+  '��' => '嫆',
+  '�@' => '媷',
+  '�A' => '嫀',
+  '�B' => '嫊',
+  '�C' => '媴',
+  '�D' => '媶',
+  '�E' => '嫍',
+  '�F' => '媹',
+  '�G' => '媐',
+  '�H' => '寖',
+  '�I' => '寘',
+  '�J' => '寙',
+  '�K' => '尟',
+  '�L' => '尳',
+  '�M' => '嵱',
+  '�N' => '嵣',
+  '�O' => '嵊',
+  '�P' => '嵥',
+  '�Q' => '嵲',
+  '�R' => '嵬',
+  '�S' => '嵞',
+  '�T' => '嵨',
+  '�U' => '嵧',
+  '�V' => '嵢',
+  '�W' => '巰',
+  '�X' => '幏',
+  '�Y' => '幎',
+  '�Z' => '幊',
+  '�[' => '幍',
+  '�\\' => '幋',
+  '�]' => '廅',
+  '�^' => '廌',
+  '�_' => '廆',
+  '�`' => '廋',
+  '�a' => '廇',
+  '�b' => '彀',
+  '�c' => '徯',
+  '�d' => '徭',
+  '�e' => '惷',
+  '�f' => '慉',
+  '�g' => '慊',
+  '�h' => '愫',
+  '�i' => '慅',
+  '�j' => '愶',
+  '�k' => '愲',
+  '�l' => '愮',
+  '�m' => '慆',
+  '�n' => '愯',
+  '�o' => '慏',
+  '�p' => '愩',
+  '�q' => '慀',
+  '�r' => '戠',
+  '�s' => '酨',
+  '�t' => '戣',
+  '�u' => '戥',
+  '�v' => '戤',
+  '�w' => '揅',
+  '�x' => '揱',
+  '�y' => '揫',
+  '�z' => '搐',
+  '�{' => '搒',
+  '�|' => '搉',
+  '�}' => '搠',
+  '�~' => '搤',
+  'ݡ' => '搳',
+  'ݢ' => '摃',
+  'ݣ' => '搟',
+  'ݤ' => '搕',
+  'ݥ' => '搘',
+  'ݦ' => '搹',
+  'ݧ' => '搷',
+  'ݨ' => '搢',
+  'ݩ' => '搣',
+  'ݪ' => '搌',
+  'ݫ' => '搦',
+  'ݬ' => '搰',
+  'ݭ' => '搨',
+  'ݮ' => '摁',
+  'ݯ' => '搵',
+  'ݰ' => '搯',
+  'ݱ' => '搊',
+  'ݲ' => '搚',
+  'ݳ' => '摀',
+  'ݴ' => '搥',
+  'ݵ' => '搧',
+  'ݶ' => '搋',
+  'ݷ' => '揧',
+  'ݸ' => '搛',
+  'ݹ' => '搮',
+  'ݺ' => '搡',
+  'ݻ' => '搎',
+  'ݼ' => '敯',
+  'ݽ' => '斒',
+  'ݾ' => '旓',
+  'ݿ' => '暆',
+  '��' => '暌',
+  '��' => '暕',
+  '��' => '暐',
+  '��' => '暋',
+  '��' => '暊',
+  '��' => '暙',
+  '��' => '暔',
+  '��' => '晸',
+  '��' => '朠',
+  '��' => '楦',
+  '��' => '楟',
+  '��' => '椸',
+  '��' => '楎',
+  '��' => '楢',
+  '��' => '楱',
+  '��' => '椿',
+  '��' => '楅',
+  '��' => '楪',
+  '��' => '椹',
+  '��' => '楂',
+  '��' => '楗',
+  '��' => '楙',
+  '��' => '楺',
+  '��' => '楈',
+  '��' => '楉',
+  '��' => '椵',
+  '��' => '楬',
+  '��' => '椳',
+  '��' => '椽',
+  '��' => '楥',
+  '��' => '棰',
+  '��' => '楸',
+  '��' => '椴',
+  '��' => '楩',
+  '��' => '楀',
+  '��' => '楯',
+  '��' => '楄',
+  '��' => '楶',
+  '��' => '楘',
+  '��' => '楁',
+  '��' => '楴',
+  '��' => '楌',
+  '��' => '椻',
+  '��' => '楋',
+  '��' => '椷',
+  '��' => '楜',
+  '��' => '楏',
+  '��' => '楑',
+  '��' => '椲',
+  '��' => '楒',
+  '��' => '椯',
+  '��' => '楻',
+  '��' => '椼',
+  '��' => '歆',
+  '��' => '歅',
+  '��' => '歃',
+  '��' => '歂',
+  '��' => '歈',
+  '��' => '歁',
+  '��' => '殛',
+  '��' => '嗀',
+  '��' => '毻',
+  '��' => '毼',
+  '�@' => '毹',
+  '�A' => '毷',
+  '�B' => '毸',
+  '�C' => '溛',
+  '�D' => '滖',
+  '�E' => '滈',
+  '�F' => '溏',
+  '�G' => '滀',
+  '�H' => '溟',
+  '�I' => '溓',
+  '�J' => '溔',
+  '�K' => '溠',
+  '�L' => '溱',
+  '�M' => '溹',
+  '�N' => '滆',
+  '�O' => '滒',
+  '�P' => '溽',
+  '�Q' => '滁',
+  '�R' => '溞',
+  '�S' => '滉',
+  '�T' => '溷',
+  '�U' => '溰',
+  '�V' => '滍',
+  '�W' => '溦',
+  '�X' => '滏',
+  '�Y' => '溲',
+  '�Z' => '溾',
+  '�[' => '滃',
+  '�\\' => '滜',
+  '�]' => '滘',
+  '�^' => '溙',
+  '�_' => '溒',
+  '�`' => '溎',
+  '�a' => '溍',
+  '�b' => '溤',
+  '�c' => '溡',
+  '�d' => '溿',
+  '�e' => '溳',
+  '�f' => '滐',
+  '�g' => '滊',
+  '�h' => '溗',
+  '�i' => '溮',
+  '�j' => '溣',
+  '�k' => '煇',
+  '�l' => '煔',
+  '�m' => '煒',
+  '�n' => '煣',
+  '�o' => '煠',
+  '�p' => '煁',
+  '�q' => '煝',
+  '�r' => '煢',
+  '�s' => '煲',
+  '�t' => '煸',
+  '�u' => '煪',
+  '�v' => '煡',
+  '�w' => '煂',
+  '�x' => '煘',
+  '�y' => '煃',
+  '�z' => '煋',
+  '�{' => '煰',
+  '�|' => '煟',
+  '�}' => '煐',
+  '�~' => '煓',
+  'ޡ' => '煄',
+  'ޢ' => '煍',
+  'ޣ' => '煚',
+  'ޤ' => '牏',
+  'ޥ' => '犍',
+  'ަ' => '犌',
+  'ާ' => '犑',
+  'ި' => '犐',
+  'ީ' => '犎',
+  'ު' => '猼',
+  'ޫ' => '獂',
+  'ެ' => '猻',
+  'ޭ' => '猺',
+  'ޮ' => '獀',
+  'ޯ' => '獊',
+  'ް' => '獉',
+  'ޱ' => '瑄',
+  '޲' => '瑊',
+  '޳' => '瑋',
+  '޴' => '瑒',
+  '޵' => '瑑',
+  '޶' => '瑗',
+  '޷' => '瑀',
+  '޸' => '瑏',
+  '޹' => '瑐',
+  '޺' => '瑎',
+  '޻' => '瑂',
+  '޼' => '瑆',
+  '޽' => '瑍',
+  '޾' => '瑔',
+  '޿' => '瓡',
+  '��' => '瓿',
+  '��' => '瓾',
+  '��' => '瓽',
+  '��' => '甝',
+  '��' => '畹',
+  '��' => '畷',
+  '��' => '榃',
+  '��' => '痯',
+  '��' => '瘏',
+  '��' => '瘃',
+  '��' => '痷',
+  '��' => '痾',
+  '��' => '痼',
+  '��' => '痹',
+  '��' => '痸',
+  '��' => '瘐',
+  '��' => '痻',
+  '��' => '痶',
+  '��' => '痭',
+  '��' => '痵',
+  '��' => '痽',
+  '��' => '皙',
+  '��' => '皵',
+  '��' => '盝',
+  '��' => '睕',
+  '��' => '睟',
+  '��' => '睠',
+  '��' => '睒',
+  '��' => '睖',
+  '��' => '睚',
+  '��' => '睩',
+  '��' => '睧',
+  '��' => '睔',
+  '��' => '睙',
+  '��' => '睭',
+  '��' => '矠',
+  '��' => '碇',
+  '��' => '碚',
+  '��' => '碔',
+  '��' => '碏',
+  '��' => '碄',
+  '��' => '碕',
+  '��' => '碅',
+  '��' => '碆',
+  '��' => '碡',
+  '��' => '碃',
+  '��' => '硹',
+  '��' => '碙',
+  '��' => '碀',
+  '��' => '碖',
+  '��' => '硻',
+  '��' => '祼',
+  '��' => '禂',
+  '��' => '祽',
+  '��' => '祹',
+  '��' => '稑',
+  '��' => '稘',
+  '��' => '稙',
+  '��' => '稒',
+  '��' => '稗',
+  '��' => '稕',
+  '��' => '稢',
+  '��' => '稓',
+  '�@' => '稛',
+  '�A' => '稐',
+  '�B' => '窣',
+  '�C' => '窢',
+  '�D' => '窞',
+  '�E' => '竫',
+  '�F' => '筦',
+  '�G' => '筤',
+  '�H' => '筭',
+  '�I' => '筴',
+  '�J' => '筩',
+  '�K' => '筲',
+  '�L' => '筥',
+  '�M' => '筳',
+  '�N' => '筱',
+  '�O' => '筰',
+  '�P' => '筡',
+  '�Q' => '筸',
+  '�R' => '筶',
+  '�S' => '筣',
+  '�T' => '粲',
+  '�U' => '粴',
+  '�V' => '粯',
+  '�W' => '綈',
+  '�X' => '綆',
+  '�Y' => '綀',
+  '�Z' => '綍',
+  '�[' => '絿',
+  '�\\' => '綅',
+  '�]' => '絺',
+  '�^' => '綎',
+  '�_' => '絻',
+  '�`' => '綃',
+  '�a' => '絼',
+  '�b' => '綌',
+  '�c' => '綔',
+  '�d' => '綄',
+  '�e' => '絽',
+  '�f' => '綒',
+  '�g' => '罭',
+  '�h' => '罫',
+  '�i' => '罧',
+  '�j' => '罨',
+  '�k' => '罬',
+  '�l' => '羦',
+  '�m' => '羥',
+  '�n' => '羧',
+  '�o' => '翛',
+  '�p' => '翜',
+  '�q' => '耡',
+  '�r' => '腤',
+  '�s' => '腠',
+  '�t' => '腷',
+  '�u' => '腜',
+  '�v' => '腩',
+  '�w' => '腛',
+  '�x' => '腢',
+  '�y' => '腲',
+  '�z' => '朡',
+  '�{' => '腞',
+  '�|' => '腶',
+  '�}' => '腧',
+  '�~' => '腯',
+  'ߡ' => '腄',
+  'ߢ' => '腡',
+  'ߣ' => '舝',
+  'ߤ' => '艉',
+  'ߥ' => '艄',
+  'ߦ' => '艀',
+  'ߧ' => '艂',
+  'ߨ' => '艅',
+  'ߩ' => '蓱',
+  'ߪ' => '萿',
+  '߫' => '葖',
+  '߬' => '葶',
+  '߭' => '葹',
+  '߮' => '蒏',
+  '߯' => '蒍',
+  '߰' => '葥',
+  '߱' => '葑',
+  '߲' => '葀',
+  '߳' => '蒆',
+  'ߴ' => '葧',
+  'ߵ' => '萰',
+  '߶' => '葍',
+  '߷' => '葽',
+  '߸' => '葚',
+  '߹' => '葙',
+  'ߺ' => '葴',
+  '߻' => '葳',
+  '߼' => '葝',
+  '߽' => '蔇',
+  '߾' => '葞',
+  '߿' => '萷',
+  '��' => '萺',
+  '��' => '萴',
+  '��' => '葺',
+  '��' => '葃',
+  '��' => '葸',
+  '��' => '萲',
+  '��' => '葅',
+  '��' => '萩',
+  '��' => '菙',
+  '��' => '葋',
+  '��' => '萯',
+  '��' => '葂',
+  '��' => '萭',
+  '��' => '葟',
+  '��' => '葰',
+  '��' => '萹',
+  '��' => '葎',
+  '��' => '葌',
+  '��' => '葒',
+  '��' => '葯',
+  '��' => '蓅',
+  '��' => '蒎',
+  '��' => '萻',
+  '��' => '葇',
+  '��' => '萶',
+  '��' => '萳',
+  '��' => '葨',
+  '��' => '葾',
+  '��' => '葄',
+  '��' => '萫',
+  '��' => '葠',
+  '��' => '葔',
+  '��' => '葮',
+  '��' => '葐',
+  '��' => '蜋',
+  '��' => '蜄',
+  '��' => '蛷',
+  '��' => '蜌',
+  '��' => '蛺',
+  '��' => '蛖',
+  '��' => '蛵',
+  '��' => '蝍',
+  '��' => '蛸',
+  '��' => '蜎',
+  '��' => '蜉',
+  '��' => '蜁',
+  '��' => '蛶',
+  '��' => '蜍',
+  '��' => '蜅',
+  '��' => '裖',
+  '��' => '裋',
+  '��' => '裍',
+  '��' => '裎',
+  '��' => '裞',
+  '��' => '裛',
+  '��' => '裚',
+  '��' => '裌',
+  '��' => '裐',
+  '��' => '覅',
+  '��' => '覛',
+  '��' => '觟',
+  '��' => '觥',
+  '��' => '觤',
+  '�@' => '觡',
+  '�A' => '觠',
+  '�B' => '觢',
+  '�C' => '觜',
+  '�D' => '触',
+  '�E' => '詶',
+  '�F' => '誆',
+  '�G' => '詿',
+  '�H' => '詡',
+  '�I' => '訿',
+  '�J' => '詷',
+  '�K' => '誂',
+  '�L' => '誄',
+  '�M' => '詵',
+  '�N' => '誃',
+  '�O' => '誁',
+  '�P' => '詴',
+  '�Q' => '詺',
+  '�R' => '谼',
+  '�S' => '豋',
+  '�T' => '豊',
+  '�U' => '豥',
+  '�V' => '豤',
+  '�W' => '豦',
+  '�X' => '貆',
+  '�Y' => '貄',
+  '�Z' => '貅',
+  '�[' => '賌',
+  '�\\' => '赨',
+  '�]' => '赩',
+  '�^' => '趑',
+  '�_' => '趌',
+  '�`' => '趎',
+  '�a' => '趏',
+  '�b' => '趍',
+  '�c' => '趓',
+  '�d' => '趔',
+  '�e' => '趐',
+  '�f' => '趒',
+  '�g' => '跰',
+  '�h' => '跠',
+  '�i' => '跬',
+  '�j' => '跱',
+  '�k' => '跮',
+  '�l' => '跐',
+  '�m' => '跩',
+  '�n' => '跣',
+  '�o' => '跢',
+  '�p' => '跧',
+  '�q' => '跲',
+  '�r' => '跫',
+  '�s' => '跴',
+  '�t' => '輆',
+  '�u' => '軿',
+  '�v' => '輁',
+  '�w' => '輀',
+  '�x' => '輅',
+  '�y' => '輇',
+  '�z' => '輈',
+  '�{' => '輂',
+  '�|' => '輋',
+  '�}' => '遒',
+  '�~' => '逿',
+  '�' => '遄',
+  '�' => '遉',
+  '�' => '逽',
+  '�' => '鄐',
+  '�' => '鄍',
+  '�' => '鄏',
+  '�' => '鄑',
+  '�' => '鄖',
+  '�' => '鄔',
+  '�' => '鄋',
+  '�' => '鄎',
+  '�' => '酮',
+  '�' => '酯',
+  '�' => '鉈',
+  '�' => '鉒',
+  '�' => '鈰',
+  '�' => '鈺',
+  '�' => '鉦',
+  '�' => '鈳',
+  '�' => '鉥',
+  '�' => '鉞',
+  '�' => '銃',
+  '�' => '鈮',
+  '�' => '鉊',
+  '�' => '鉆',
+  '�' => '鉭',
+  '�' => '鉬',
+  '�' => '鉏',
+  '�' => '鉠',
+  '�' => '鉧',
+  '�' => '鉯',
+  '��' => '鈶',
+  '��' => '鉡',
+  '��' => '鉰',
+  '��' => '鈱',
+  '��' => '鉔',
+  '��' => '鉣',
+  '��' => '鉐',
+  '��' => '鉲',
+  '��' => '鉎',
+  '��' => '鉓',
+  '��' => '鉌',
+  '��' => '鉖',
+  '��' => '鈲',
+  '��' => '閟',
+  '��' => '閜',
+  '��' => '閞',
+  '��' => '閛',
+  '��' => '隒',
+  '��' => '隓',
+  '��' => '隑',
+  '��' => '隗',
+  '��' => '雎',
+  '��' => '雺',
+  '��' => '雽',
+  '��' => '雸',
+  '��' => '雵',
+  '��' => '靳',
+  '��' => '靷',
+  '��' => '靸',
+  '��' => '靲',
+  '��' => '頏',
+  '��' => '頍',
+  '��' => '頎',
+  '��' => '颬',
+  '��' => '飶',
+  '��' => '飹',
+  '��' => '馯',
+  '��' => '馲',
+  '��' => '馰',
+  '��' => '馵',
+  '��' => '骭',
+  '��' => '骫',
+  '��' => '魛',
+  '��' => '鳪',
+  '��' => '鳭',
+  '��' => '鳧',
+  '��' => '麀',
+  '��' => '黽',
+  '��' => '僦',
+  '��' => '僔',
+  '��' => '僗',
+  '��' => '僨',
+  '��' => '僳',
+  '��' => '僛',
+  '��' => '僪',
+  '��' => '僝',
+  '��' => '僤',
+  '��' => '僓',
+  '��' => '僬',
+  '��' => '僰',
+  '��' => '僯',
+  '��' => '僣',
+  '��' => '僠',
+  '�@' => '凘',
+  '�A' => '劀',
+  '�B' => '劁',
+  '�C' => '勩',
+  '�D' => '勫',
+  '�E' => '匰',
+  '�F' => '厬',
+  '�G' => '嘧',
+  '�H' => '嘕',
+  '�I' => '嘌',
+  '�J' => '嘒',
+  '�K' => '嗼',
+  '�L' => '嘏',
+  '�M' => '嘜',
+  '�N' => '嘁',
+  '�O' => '嘓',
+  '�P' => '嘂',
+  '�Q' => '嗺',
+  '�R' => '嘝',
+  '�S' => '嘄',
+  '�T' => '嗿',
+  '�U' => '嗹',
+  '�V' => '墉',
+  '�W' => '塼',
+  '�X' => '墐',
+  '�Y' => '墘',
+  '�Z' => '墆',
+  '�[' => '墁',
+  '�\\' => '塿',
+  '�]' => '塴',
+  '�^' => '墋',
+  '�_' => '塺',
+  '�`' => '墇',
+  '�a' => '墑',
+  '�b' => '墎',
+  '�c' => '塶',
+  '�d' => '墂',
+  '�e' => '墈',
+  '�f' => '塻',
+  '�g' => '墔',
+  '�h' => '墏',
+  '�i' => '壾',
+  '�j' => '奫',
+  '�k' => '嫜',
+  '�l' => '嫮',
+  '�m' => '嫥',
+  '�n' => '嫕',
+  '�o' => '嫪',
+  '�p' => '嫚',
+  '�q' => '嫭',
+  '�r' => '嫫',
+  '�s' => '嫳',
+  '�t' => '嫢',
+  '�u' => '嫠',
+  '�v' => '嫛',
+  '�w' => '嫬',
+  '�x' => '嫞',
+  '�y' => '嫝',
+  '�z' => '嫙',
+  '�{' => '嫨',
+  '�|' => '嫟',
+  '�}' => '孷',
+  '�~' => '寠',
+  '�' => '寣',
+  '�' => '屣',
+  '�' => '嶂',
+  '�' => '嶀',
+  '�' => '嵽',
+  '�' => '嶆',
+  '�' => '嵺',
+  '�' => '嶁',
+  '�' => '嵷',
+  '�' => '嶊',
+  '�' => '嶉',
+  '�' => '嶈',
+  '�' => '嵾',
+  '�' => '嵼',
+  '�' => '嶍',
+  '�' => '嵹',
+  '�' => '嵿',
+  '�' => '幘',
+  '�' => '幙',
+  '�' => '幓',
+  '�' => '廘',
+  '�' => '廑',
+  '�' => '廗',
+  '�' => '廎',
+  '�' => '廜',
+  '�' => '廕',
+  '�' => '廙',
+  '�' => '廒',
+  '�' => '廔',
+  '�' => '彄',
+  '�' => '彃',
+  '��' => '彯',
+  '��' => '徶',
+  '��' => '愬',
+  '��' => '愨',
+  '��' => '慁',
+  '��' => '慞',
+  '��' => '慱',
+  '��' => '慳',
+  '��' => '慒',
+  '��' => '慓',
+  '��' => '慲',
+  '��' => '慬',
+  '��' => '憀',
+  '��' => '慴',
+  '��' => '慔',
+  '��' => '慺',
+  '��' => '慛',
+  '��' => '慥',
+  '��' => '愻',
+  '��' => '慪',
+  '��' => '慡',
+  '��' => '慖',
+  '��' => '戩',
+  '��' => '戧',
+  '��' => '戫',
+  '��' => '搫',
+  '��' => '摍',
+  '��' => '摛',
+  '��' => '摝',
+  '��' => '摴',
+  '��' => '摶',
+  '��' => '摲',
+  '��' => '摳',
+  '��' => '摽',
+  '��' => '摵',
+  '��' => '摦',
+  '��' => '撦',
+  '��' => '摎',
+  '��' => '撂',
+  '��' => '摞',
+  '��' => '摜',
+  '��' => '摋',
+  '��' => '摓',
+  '��' => '摠',
+  '��' => '摐',
+  '��' => '摿',
+  '��' => '搿',
+  '��' => '摬',
+  '��' => '摫',
+  '��' => '摙',
+  '��' => '摥',
+  '��' => '摷',
+  '��' => '敳',
+  '��' => '斠',
+  '��' => '暡',
+  '��' => '暠',
+  '��' => '暟',
+  '��' => '朅',
+  '��' => '朄',
+  '��' => '朢',
+  '��' => '榱',
+  '��' => '榶',
+  '��' => '槉',
+  '�@' => '榠',
+  '�A' => '槎',
+  '�B' => '榖',
+  '�C' => '榰',
+  '�D' => '榬',
+  '�E' => '榼',
+  '�F' => '榑',
+  '�G' => '榙',
+  '�H' => '榎',
+  '�I' => '榧',
+  '�J' => '榍',
+  '�K' => '榩',
+  '�L' => '榾',
+  '�M' => '榯',
+  '�N' => '榿',
+  '�O' => '槄',
+  '�P' => '榽',
+  '�Q' => '榤',
+  '�R' => '槔',
+  '�S' => '榹',
+  '�T' => '槊',
+  '�U' => '榚',
+  '�V' => '槏',
+  '�W' => '榳',
+  '�X' => '榓',
+  '�Y' => '榪',
+  '�Z' => '榡',
+  '�[' => '榞',
+  '�\\' => '槙',
+  '�]' => '榗',
+  '�^' => '榐',
+  '�_' => '槂',
+  '�`' => '榵',
+  '�a' => '榥',
+  '�b' => '槆',
+  '�c' => '歊',
+  '�d' => '歍',
+  '�e' => '歋',
+  '�f' => '殞',
+  '�g' => '殟',
+  '�h' => '殠',
+  '�i' => '毃',
+  '�j' => '毄',
+  '�k' => '毾',
+  '�l' => '滎',
+  '�m' => '滵',
+  '�n' => '滱',
+  '�o' => '漃',
+  '�p' => '漥',
+  '�q' => '滸',
+  '�r' => '漷',
+  '�s' => '滻',
+  '�t' => '漮',
+  '�u' => '漉',
+  '�v' => '潎',
+  '�w' => '漙',
+  '�x' => '漚',
+  '�y' => '漧',
+  '�z' => '漘',
+  '�{' => '漻',
+  '�|' => '漒',
+  '�}' => '滭',
+  '�~' => '漊',
+  '�' => '漶',
+  '�' => '潳',
+  '�' => '滹',
+  '�' => '滮',
+  '�' => '漭',
+  '�' => '潀',
+  '�' => '漰',
+  '�' => '漼',
+  '�' => '漵',
+  '�' => '滫',
+  '�' => '漇',
+  '�' => '漎',
+  '�' => '潃',
+  '�' => '漅',
+  '�' => '滽',
+  '�' => '滶',
+  '�' => '漹',
+  '�' => '漜',
+  '�' => '滼',
+  '�' => '漺',
+  '�' => '漟',
+  '�' => '漍',
+  '�' => '漞',
+  '�' => '漈',
+  '�' => '漡',
+  '�' => '熇',
+  '�' => '熐',
+  '�' => '熉',
+  '�' => '熀',
+  '�' => '熅',
+  '�' => '熂',
+  '��' => '熏',
+  '��' => '煻',
+  '��' => '熆',
+  '��' => '熁',
+  '��' => '熗',
+  '��' => '牄',
+  '��' => '牓',
+  '��' => '犗',
+  '��' => '犕',
+  '��' => '犓',
+  '��' => '獃',
+  '��' => '獍',
+  '��' => '獑',
+  '��' => '獌',
+  '��' => '瑢',
+  '��' => '瑳',
+  '��' => '瑱',
+  '��' => '瑵',
+  '��' => '瑲',
+  '��' => '瑧',
+  '��' => '瑮',
+  '��' => '甀',
+  '��' => '甂',
+  '��' => '甃',
+  '��' => '畽',
+  '��' => '疐',
+  '��' => '瘖',
+  '��' => '瘈',
+  '��' => '瘌',
+  '��' => '瘕',
+  '��' => '瘑',
+  '��' => '瘊',
+  '��' => '瘔',
+  '��' => '皸',
+  '��' => '瞁',
+  '��' => '睼',
+  '��' => '瞅',
+  '��' => '瞂',
+  '��' => '睮',
+  '��' => '瞀',
+  '��' => '睯',
+  '��' => '睾',
+  '��' => '瞃',
+  '��' => '碲',
+  '��' => '碪',
+  '��' => '碴',
+  '��' => '碭',
+  '��' => '碨',
+  '��' => '硾',
+  '��' => '碫',
+  '��' => '碞',
+  '��' => '碥',
+  '��' => '碠',
+  '��' => '碬',
+  '��' => '碢',
+  '��' => '碤',
+  '��' => '禘',
+  '��' => '禊',
+  '��' => '禋',
+  '��' => '禖',
+  '��' => '禕',
+  '��' => '禔',
+  '��' => '禓',
+  '�@' => '禗',
+  '�A' => '禈',
+  '�B' => '禒',
+  '�C' => '禐',
+  '�D' => '稫',
+  '�E' => '穊',
+  '�F' => '稰',
+  '�G' => '稯',
+  '�H' => '稨',
+  '�I' => '稦',
+  '�J' => '窨',
+  '�K' => '窫',
+  '�L' => '窬',
+  '�M' => '竮',
+  '�N' => '箈',
+  '�O' => '箜',
+  '�P' => '箊',
+  '�Q' => '箑',
+  '�R' => '箐',
+  '�S' => '箖',
+  '�T' => '箍',
+  '�U' => '箌',
+  '�V' => '箛',
+  '�W' => '箎',
+  '�X' => '箅',
+  '�Y' => '箘',
+  '�Z' => '劄',
+  '�[' => '箙',
+  '�\\' => '箤',
+  '�]' => '箂',
+  '�^' => '粻',
+  '�_' => '粿',
+  '�`' => '粼',
+  '�a' => '粺',
+  '�b' => '綧',
+  '�c' => '綷',
+  '�d' => '緂',
+  '�e' => '綣',
+  '�f' => '綪',
+  '�g' => '緁',
+  '�h' => '緀',
+  '�i' => '緅',
+  '�j' => '綝',
+  '�k' => '緎',
+  '�l' => '緄',
+  '�m' => '緆',
+  '�n' => '緋',
+  '�o' => '緌',
+  '�p' => '綯',
+  '�q' => '綹',
+  '�r' => '綖',
+  '�s' => '綼',
+  '�t' => '綟',
+  '�u' => '綦',
+  '�v' => '綮',
+  '�w' => '綩',
+  '�x' => '綡',
+  '�y' => '緉',
+  '�z' => '罳',
+  '�{' => '翢',
+  '�|' => '翣',
+  '�}' => '翥',
+  '�~' => '翞',
+  '�' => '耤',
+  '�' => '聝',
+  '�' => '聜',
+  '�' => '膉',
+  '�' => '膆',
+  '�' => '膃',
+  '�' => '膇',
+  '�' => '膍',
+  '�' => '膌',
+  '�' => '膋',
+  '�' => '舕',
+  '�' => '蒗',
+  '�' => '蒤',
+  '�' => '蒡',
+  '�' => '蒟',
+  '�' => '蒺',
+  '�' => '蓎',
+  '�' => '蓂',
+  '�' => '蒬',
+  '�' => '蒮',
+  '�' => '蒫',
+  '�' => '蒹',
+  '�' => '蒴',
+  '�' => '蓁',
+  '�' => '蓍',
+  '�' => '蒪',
+  '�' => '蒚',
+  '�' => '蒱',
+  '�' => '蓐',
+  '�' => '蒝',
+  '�' => '蒧',
+  '��' => '蒻',
+  '��' => '蒢',
+  '��' => '蒔',
+  '��' => '蓇',
+  '��' => '蓌',
+  '��' => '蒛',
+  '��' => '蒩',
+  '��' => '蒯',
+  '��' => '蒨',
+  '��' => '蓖',
+  '��' => '蒘',
+  '��' => '蒶',
+  '��' => '蓏',
+  '��' => '蒠',
+  '��' => '蓗',
+  '��' => '蓔',
+  '��' => '蓒',
+  '��' => '蓛',
+  '��' => '蒰',
+  '��' => '蒑',
+  '��' => '虡',
+  '��' => '蜳',
+  '��' => '蜣',
+  '��' => '蜨',
+  '��' => '蝫',
+  '��' => '蝀',
+  '��' => '蜮',
+  '��' => '蜞',
+  '��' => '蜡',
+  '��' => '蜙',
+  '��' => '蜛',
+  '��' => '蝃',
+  '��' => '蜬',
+  '��' => '蝁',
+  '��' => '蜾',
+  '��' => '蝆',
+  '��' => '蜠',
+  '��' => '蜲',
+  '��' => '蜪',
+  '��' => '蜭',
+  '��' => '蜼',
+  '��' => '蜒',
+  '��' => '蜺',
+  '��' => '蜱',
+  '��' => '蜵',
+  '��' => '蝂',
+  '��' => '蜦',
+  '��' => '蜧',
+  '��' => '蜸',
+  '��' => '蜤',
+  '��' => '蜚',
+  '��' => '蜰',
+  '��' => '蜑',
+  '��' => '裷',
+  '��' => '裧',
+  '��' => '裱',
+  '��' => '裲',
+  '��' => '裺',
+  '��' => '裾',
+  '��' => '裮',
+  '��' => '裼',
+  '��' => '裶',
+  '��' => '裻',
+  '�@' => '裰',
+  '�A' => '裬',
+  '�B' => '裫',
+  '�C' => '覝',
+  '�D' => '覡',
+  '�E' => '覟',
+  '�F' => '覞',
+  '�G' => '觩',
+  '�H' => '觫',
+  '�I' => '觨',
+  '�J' => '誫',
+  '�K' => '誙',
+  '�L' => '誋',
+  '�M' => '誒',
+  '�N' => '誏',
+  '�O' => '誖',
+  '�P' => '谽',
+  '�Q' => '豨',
+  '�R' => '豩',
+  '�S' => '賕',
+  '�T' => '賏',
+  '�U' => '賗',
+  '�V' => '趖',
+  '�W' => '踉',
+  '�X' => '踂',
+  '�Y' => '跿',
+  '�Z' => '踍',
+  '�[' => '跽',
+  '�\\' => '踊',
+  '�]' => '踃',
+  '�^' => '踇',
+  '�_' => '踆',
+  '�`' => '踅',
+  '�a' => '跾',
+  '�b' => '踀',
+  '�c' => '踄',
+  '�d' => '輐',
+  '�e' => '輑',
+  '�f' => '輎',
+  '�g' => '輍',
+  '�h' => '鄣',
+  '�i' => '鄜',
+  '�j' => '鄠',
+  '�k' => '鄢',
+  '�l' => '鄟',
+  '�m' => '鄝',
+  '�n' => '鄚',
+  '�o' => '鄤',
+  '�p' => '鄡',
+  '�q' => '鄛',
+  '�r' => '酺',
+  '�s' => '酲',
+  '�t' => '酹',
+  '�u' => '酳',
+  '�v' => '銥',
+  '�w' => '銤',
+  '�x' => '鉶',
+  '�y' => '銛',
+  '�z' => '鉺',
+  '�{' => '銠',
+  '�|' => '銔',
+  '�}' => '銪',
+  '�~' => '銍',
+  '�' => '銦',
+  '�' => '銚',
+  '�' => '銫',
+  '�' => '鉹',
+  '�' => '銗',
+  '�' => '鉿',
+  '�' => '銣',
+  '�' => '鋮',
+  '�' => '銎',
+  '�' => '銂',
+  '�' => '銕',
+  '�' => '銢',
+  '�' => '鉽',
+  '�' => '銈',
+  '�' => '銡',
+  '�' => '銊',
+  '�' => '銆',
+  '�' => '銌',
+  '�' => '銙',
+  '�' => '銧',
+  '�' => '鉾',
+  '�' => '銇',
+  '�' => '銩',
+  '�' => '銝',
+  '�' => '銋',
+  '�' => '鈭',
+  '�' => '隞',
+  '�' => '隡',
+  '�' => '雿',
+  '�' => '靘',
+  '�' => '靽',
+  '��' => '靺',
+  '��' => '靾',
+  '��' => '鞃',
+  '��' => '鞀',
+  '��' => '鞂',
+  '��' => '靻',
+  '��' => '鞄',
+  '��' => '鞁',
+  '��' => '靿',
+  '��' => '韎',
+  '��' => '韍',
+  '��' => '頖',
+  '��' => '颭',
+  '��' => '颮',
+  '��' => '餂',
+  '��' => '餀',
+  '��' => '餇',
+  '��' => '馝',
+  '��' => '馜',
+  '��' => '駃',
+  '��' => '馹',
+  '��' => '馻',
+  '��' => '馺',
+  '��' => '駂',
+  '��' => '馽',
+  '��' => '駇',
+  '��' => '骱',
+  '��' => '髣',
+  '��' => '髧',
+  '��' => '鬾',
+  '��' => '鬿',
+  '��' => '魠',
+  '��' => '魡',
+  '��' => '魟',
+  '��' => '鳱',
+  '��' => '鳲',
+  '��' => '鳵',
+  '��' => '麧',
+  '��' => '僿',
+  '��' => '儃',
+  '��' => '儰',
+  '��' => '僸',
+  '��' => '儆',
+  '��' => '儇',
+  '��' => '僶',
+  '��' => '僾',
+  '��' => '儋',
+  '��' => '儌',
+  '��' => '僽',
+  '��' => '儊',
+  '��' => '劋',
+  '��' => '劌',
+  '��' => '勱',
+  '��' => '勯',
+  '��' => '噈',
+  '��' => '噂',
+  '��' => '噌',
+  '��' => '嘵',
+  '��' => '噁',
+  '��' => '噊',
+  '��' => '噉',
+  '��' => '噆',
+  '��' => '噘',
+  '�@' => '噚',
+  '�A' => '噀',
+  '�B' => '嘳',
+  '�C' => '嘽',
+  '�D' => '嘬',
+  '�E' => '嘾',
+  '�F' => '嘸',
+  '�G' => '嘪',
+  '�H' => '嘺',
+  '�I' => '圚',
+  '�J' => '墫',
+  '�K' => '墝',
+  '�L' => '墱',
+  '�M' => '墠',
+  '�N' => '墣',
+  '�O' => '墯',
+  '�P' => '墬',
+  '�Q' => '墥',
+  '�R' => '墡',
+  '�S' => '壿',
+  '�T' => '嫿',
+  '�U' => '嫴',
+  '�V' => '嫽',
+  '�W' => '嫷',
+  '�X' => '嫶',
+  '�Y' => '嬃',
+  '�Z' => '嫸',
+  '�[' => '嬂',
+  '�\\' => '嫹',
+  '�]' => '嬁',
+  '�^' => '嬇',
+  '�_' => '嬅',
+  '�`' => '嬏',
+  '�a' => '屧',
+  '�b' => '嶙',
+  '�c' => '嶗',
+  '�d' => '嶟',
+  '�e' => '嶒',
+  '�f' => '嶢',
+  '�g' => '嶓',
+  '�h' => '嶕',
+  '�i' => '嶠',
+  '�j' => '嶜',
+  '�k' => '嶡',
+  '�l' => '嶚',
+  '�m' => '嶞',
+  '�n' => '幩',
+  '�o' => '幝',
+  '�p' => '幠',
+  '�q' => '幜',
+  '�r' => '緳',
+  '�s' => '廛',
+  '�t' => '廞',
+  '�u' => '廡',
+  '�v' => '彉',
+  '�w' => '徲',
+  '�x' => '憋',
+  '�y' => '憃',
+  '�z' => '慹',
+  '�{' => '憱',
+  '�|' => '憰',
+  '�}' => '憢',
+  '�~' => '憉',
+  '�' => '憛',
+  '�' => '憓',
+  '�' => '憯',
+  '�' => '憭',
+  '�' => '憟',
+  '�' => '憒',
+  '�' => '憪',
+  '�' => '憡',
+  '�' => '憍',
+  '�' => '慦',
+  '�' => '憳',
+  '�' => '戭',
+  '�' => '摮',
+  '�' => '摰',
+  '�' => '撖',
+  '�' => '撠',
+  '�' => '撅',
+  '�' => '撗',
+  '�' => '撜',
+  '�' => '撏',
+  '�' => '撋',
+  '�' => '撊',
+  '�' => '撌',
+  '�' => '撣',
+  '�' => '撟',
+  '�' => '摨',
+  '�' => '撱',
+  '�' => '撘',
+  '�' => '敶',
+  '�' => '敺',
+  '�' => '敹',
+  '��' => '敻',
+  '��' => '斲',
+  '��' => '斳',
+  '��' => '暵',
+  '��' => '暰',
+  '��' => '暩',
+  '��' => '暲',
+  '��' => '暷',
+  '��' => '暪',
+  '��' => '暯',
+  '��' => '樀',
+  '��' => '樆',
+  '��' => '樗',
+  '��' => '槥',
+  '��' => '槸',
+  '��' => '樕',
+  '��' => '槱',
+  '��' => '槤',
+  '��' => '樠',
+  '��' => '槿',
+  '��' => '槬',
+  '��' => '槢',
+  '��' => '樛',
+  '��' => '樝',
+  '��' => '槾',
+  '��' => '樧',
+  '��' => '槲',
+  '��' => '槮',
+  '��' => '樔',
+  '��' => '槷',
+  '��' => '槧',
+  '��' => '橀',
+  '��' => '樈',
+  '��' => '槦',
+  '��' => '槻',
+  '��' => '樍',
+  '��' => '槼',
+  '��' => '槫',
+  '��' => '樉',
+  '��' => '樄',
+  '��' => '樘',
+  '��' => '樥',
+  '��' => '樏',
+  '��' => '槶',
+  '��' => '樦',
+  '��' => '樇',
+  '��' => '槴',
+  '��' => '樖',
+  '��' => '歑',
+  '��' => '殥',
+  '��' => '殣',
+  '��' => '殢',
+  '��' => '殦',
+  '��' => '氁',
+  '��' => '氀',
+  '��' => '毿',
+  '��' => '氂',
+  '��' => '潁',
+  '��' => '漦',
+  '��' => '潾',
+  '��' => '澇',
+  '��' => '濆',
+  '��' => '澒',
+  '�@' => '澍',
+  '�A' => '澉',
+  '�B' => '澌',
+  '�C' => '潢',
+  '�D' => '潏',
+  '�E' => '澅',
+  '�F' => '潚',
+  '�G' => '澖',
+  '�H' => '潶',
+  '�I' => '潬',
+  '�J' => '澂',
+  '�K' => '潕',
+  '�L' => '潲',
+  '�M' => '潒',
+  '�N' => '潐',
+  '�O' => '潗',
+  '�P' => '澔',
+  '�Q' => '澓',
+  '�R' => '潝',
+  '�S' => '漀',
+  '�T' => '潡',
+  '�U' => '潫',
+  '�V' => '潽',
+  '�W' => '潧',
+  '�X' => '澐',
+  '�Y' => '潓',
+  '�Z' => '澋',
+  '�[' => '潩',
+  '�\\' => '潿',
+  '�]' => '澕',
+  '�^' => '潣',
+  '�_' => '潷',
+  '�`' => '潪',
+  '�a' => '潻',
+  '�b' => '熲',
+  '�c' => '熯',
+  '�d' => '熛',
+  '�e' => '熰',
+  '�f' => '熠',
+  '�g' => '熚',
+  '�h' => '熩',
+  '�i' => '熵',
+  '�j' => '熝',
+  '�k' => '熥',
+  '�l' => '熞',
+  '�m' => '熤',
+  '�n' => '熡',
+  '�o' => '熪',
+  '�p' => '熜',
+  '�q' => '熧',
+  '�r' => '熳',
+  '�s' => '犘',
+  '�t' => '犚',
+  '�u' => '獘',
+  '�v' => '獒',
+  '�w' => '獞',
+  '�x' => '獟',
+  '�y' => '獠',
+  '�z' => '獝',
+  '�{' => '獛',
+  '�|' => '獡',
+  '�}' => '獚',
+  '�~' => '獙',
+  '�' => '獢',
+  '�' => '璇',
+  '�' => '璉',
+  '�' => '璊',
+  '�' => '璆',
+  '�' => '璁',
+  '�' => '瑽',
+  '�' => '璅',
+  '�' => '璈',
+  '�' => '瑼',
+  '�' => '瑹',
+  '�' => '甈',
+  '�' => '甇',
+  '�' => '畾',
+  '�' => '瘥',
+  '�' => '瘞',
+  '�' => '瘙',
+  '�' => '瘝',
+  '�' => '瘜',
+  '�' => '瘣',
+  '�' => '瘚',
+  '�' => '瘨',
+  '�' => '瘛',
+  '�' => '皜',
+  '�' => '皝',
+  '�' => '皞',
+  '�' => '皛',
+  '�' => '瞍',
+  '�' => '瞏',
+  '�' => '瞉',
+  '�' => '瞈',
+  '��' => '磍',
+  '��' => '碻',
+  '��' => '磏',
+  '��' => '磌',
+  '��' => '磑',
+  '��' => '磎',
+  '��' => '磔',
+  '��' => '磈',
+  '��' => '磃',
+  '��' => '磄',
+  '��' => '磉',
+  '��' => '禚',
+  '��' => '禡',
+  '��' => '禠',
+  '��' => '禜',
+  '��' => '禢',
+  '��' => '禛',
+  '��' => '歶',
+  '��' => '稹',
+  '��' => '窲',
+  '��' => '窴',
+  '��' => '窳',
+  '��' => '箷',
+  '��' => '篋',
+  '��' => '箾',
+  '��' => '箬',
+  '��' => '篎',
+  '��' => '箯',
+  '��' => '箹',
+  '��' => '篊',
+  '��' => '箵',
+  '��' => '糅',
+  '��' => '糈',
+  '��' => '糌',
+  '��' => '糋',
+  '��' => '緷',
+  '��' => '緛',
+  '��' => '緪',
+  '��' => '緧',
+  '��' => '緗',
+  '��' => '緡',
+  '��' => '縃',
+  '��' => '緺',
+  '��' => '緦',
+  '��' => '緶',
+  '��' => '緱',
+  '��' => '緰',
+  '��' => '緮',
+  '��' => '緟',
+  '��' => '罶',
+  '��' => '羬',
+  '��' => '羰',
+  '��' => '羭',
+  '��' => '翭',
+  '��' => '翫',
+  '��' => '翪',
+  '��' => '翬',
+  '��' => '翦',
+  '��' => '翨',
+  '��' => '聤',
+  '��' => '聧',
+  '��' => '膣',
+  '��' => '膟',
+  '�@' => '膞',
+  '�A' => '膕',
+  '�B' => '膢',
+  '�C' => '膙',
+  '�D' => '膗',
+  '�E' => '舖',
+  '�F' => '艏',
+  '�G' => '艓',
+  '�H' => '艒',
+  '�I' => '艐',
+  '�J' => '艎',
+  '�K' => '艑',
+  '�L' => '蔤',
+  '�M' => '蔻',
+  '�N' => '蔏',
+  '�O' => '蔀',
+  '�P' => '蔩',
+  '�Q' => '蔎',
+  '�R' => '蔉',
+  '�S' => '蔍',
+  '�T' => '蔟',
+  '�U' => '蔊',
+  '�V' => '蔧',
+  '�W' => '蔜',
+  '�X' => '蓻',
+  '�Y' => '蔫',
+  '�Z' => '蓺',
+  '�[' => '蔈',
+  '�\\' => '蔌',
+  '�]' => '蓴',
+  '�^' => '蔪',
+  '�_' => '蓲',
+  '�`' => '蔕',
+  '�a' => '蓷',
+  '�b' => '蓫',
+  '�c' => '蓳',
+  '�d' => '蓼',
+  '�e' => '蔒',
+  '�f' => '蓪',
+  '�g' => '蓩',
+  '�h' => '蔖',
+  '�i' => '蓾',
+  '�j' => '蔨',
+  '�k' => '蔝',
+  '�l' => '蔮',
+  '�m' => '蔂',
+  '�n' => '蓽',
+  '�o' => '蔞',
+  '�p' => '蓶',
+  '�q' => '蔱',
+  '�r' => '蔦',
+  '�s' => '蓧',
+  '�t' => '蓨',
+  '�u' => '蓰',
+  '�v' => '蓯',
+  '�w' => '蓹',
+  '�x' => '蔘',
+  '�y' => '蔠',
+  '�z' => '蔰',
+  '�{' => '蔋',
+  '�|' => '蔙',
+  '�}' => '蔯',
+  '�~' => '虢',
+  '�' => '蝖',
+  '�' => '蝣',
+  '�' => '蝤',
+  '�' => '蝷',
+  '�' => '蟡',
+  '�' => '蝳',
+  '�' => '蝘',
+  '�' => '蝔',
+  '�' => '蝛',
+  '�' => '蝒',
+  '�' => '蝡',
+  '�' => '蝚',
+  '�' => '蝑',
+  '�' => '蝞',
+  '�' => '蝭',
+  '�' => '蝪',
+  '�' => '蝐',
+  '�' => '蝎',
+  '�' => '蝟',
+  '�' => '蝝',
+  '�' => '蝯',
+  '�' => '蝬',
+  '�' => '蝺',
+  '�' => '蝮',
+  '�' => '蝜',
+  '�' => '蝥',
+  '�' => '蝏',
+  '�' => '蝻',
+  '�' => '蝵',
+  '�' => '蝢',
+  '�' => '蝧',
+  '��' => '蝩',
+  '��' => '衚',
+  '��' => '褅',
+  '��' => '褌',
+  '��' => '褔',
+  '��' => '褋',
+  '��' => '褗',
+  '��' => '褘',
+  '��' => '褙',
+  '��' => '褆',
+  '��' => '褖',
+  '��' => '褑',
+  '��' => '褎',
+  '��' => '褉',
+  '��' => '覢',
+  '��' => '覤',
+  '��' => '覣',
+  '��' => '觭',
+  '��' => '觰',
+  '��' => '觬',
+  '��' => '諏',
+  '��' => '諆',
+  '��' => '誸',
+  '��' => '諓',
+  '��' => '諑',
+  '��' => '諔',
+  '��' => '諕',
+  '��' => '誻',
+  '��' => '諗',
+  '��' => '誾',
+  '��' => '諀',
+  '��' => '諅',
+  '��' => '諘',
+  '��' => '諃',
+  '��' => '誺',
+  '��' => '誽',
+  '��' => '諙',
+  '��' => '谾',
+  '��' => '豍',
+  '��' => '貏',
+  '��' => '賥',
+  '��' => '賟',
+  '��' => '賙',
+  '��' => '賨',
+  '��' => '賚',
+  '��' => '賝',
+  '��' => '賧',
+  '��' => '趠',
+  '��' => '趜',
+  '��' => '趡',
+  '��' => '趛',
+  '��' => '踠',
+  '��' => '踣',
+  '��' => '踥',
+  '��' => '踤',
+  '��' => '踮',
+  '��' => '踕',
+  '��' => '踛',
+  '��' => '踖',
+  '��' => '踑',
+  '��' => '踙',
+  '��' => '踦',
+  '��' => '踧',
+  '�@' => '踔',
+  '�A' => '踒',
+  '�B' => '踘',
+  '�C' => '踓',
+  '�D' => '踜',
+  '�E' => '踗',
+  '�F' => '踚',
+  '�G' => '輬',
+  '�H' => '輤',
+  '�I' => '輘',
+  '�J' => '輚',
+  '�K' => '輠',
+  '�L' => '輣',
+  '�M' => '輖',
+  '�N' => '輗',
+  '�O' => '遳',
+  '�P' => '遰',
+  '�Q' => '遯',
+  '�R' => '遧',
+  '�S' => '遫',
+  '�T' => '鄯',
+  '�U' => '鄫',
+  '�V' => '鄩',
+  '�W' => '鄪',
+  '�X' => '鄲',
+  '�Y' => '鄦',
+  '�Z' => '鄮',
+  '�[' => '醅',
+  '�\\' => '醆',
+  '�]' => '醊',
+  '�^' => '醁',
+  '�_' => '醂',
+  '�`' => '醄',
+  '�a' => '醀',
+  '�b' => '鋐',
+  '�c' => '鋃',
+  '�d' => '鋄',
+  '�e' => '鋀',
+  '�f' => '鋙',
+  '�g' => '銶',
+  '�h' => '鋏',
+  '�i' => '鋱',
+  '�j' => '鋟',
+  '�k' => '鋘',
+  '�l' => '鋩',
+  '�m' => '鋗',
+  '�n' => '鋝',
+  '�o' => '鋌',
+  '�p' => '鋯',
+  '�q' => '鋂',
+  '�r' => '鋨',
+  '�s' => '鋊',
+  '�t' => '鋈',
+  '�u' => '鋎',
+  '�v' => '鋦',
+  '�w' => '鋍',
+  '�x' => '鋕',
+  '�y' => '鋉',
+  '�z' => '鋠',
+  '�{' => '鋞',
+  '�|' => '鋧',
+  '�}' => '鋑',
+  '�~' => '鋓',
+  '�' => '銵',
+  '�' => '鋡',
+  '�' => '鋆',
+  '�' => '銴',
+  '�' => '镼',
+  '�' => '閬',
+  '�' => '閫',
+  '�' => '閮',
+  '�' => '閰',
+  '�' => '隤',
+  '�' => '隢',
+  '�' => '雓',
+  '�' => '霅',
+  '�' => '霈',
+  '�' => '霂',
+  '�' => '靚',
+  '�' => '鞊',
+  '�' => '鞎',
+  '�' => '鞈',
+  '�' => '韐',
+  '�' => '韏',
+  '�' => '頞',
+  '�' => '頝',
+  '�' => '頦',
+  '�' => '頩',
+  '�' => '頨',
+  '�' => '頠',
+  '�' => '頛',
+  '�' => '頧',
+  '�' => '颲',
+  '�' => '餈',
+  '��' => '飺',
+  '��' => '餑',
+  '��' => '餔',
+  '��' => '餖',
+  '��' => '餗',
+  '��' => '餕',
+  '��' => '駜',
+  '��' => '駍',
+  '��' => '駏',
+  '��' => '駓',
+  '��' => '駔',
+  '��' => '駎',
+  '��' => '駉',
+  '��' => '駖',
+  '��' => '駘',
+  '��' => '駋',
+  '��' => '駗',
+  '��' => '駌',
+  '��' => '骳',
+  '��' => '髬',
+  '��' => '髫',
+  '��' => '髳',
+  '��' => '髲',
+  '��' => '髱',
+  '��' => '魆',
+  '��' => '魃',
+  '��' => '魧',
+  '��' => '魴',
+  '��' => '魱',
+  '��' => '魦',
+  '��' => '魶',
+  '��' => '魵',
+  '��' => '魰',
+  '��' => '魨',
+  '��' => '魤',
+  '��' => '魬',
+  '��' => '鳼',
+  '��' => '鳺',
+  '��' => '鳽',
+  '��' => '鳿',
+  '��' => '鳷',
+  '��' => '鴇',
+  '��' => '鴀',
+  '��' => '鳹',
+  '��' => '鳻',
+  '��' => '鴈',
+  '��' => '鴅',
+  '��' => '鴄',
+  '��' => '麃',
+  '��' => '黓',
+  '��' => '鼏',
+  '��' => '鼐',
+  '��' => '儜',
+  '��' => '儓',
+  '��' => '儗',
+  '��' => '儚',
+  '��' => '儑',
+  '��' => '凞',
+  '��' => '匴',
+  '��' => '叡',
+  '��' => '噰',
+  '��' => '噠',
+  '��' => '噮',
+  '�@' => '噳',
+  '�A' => '噦',
+  '�B' => '噣',
+  '�C' => '噭',
+  '�D' => '噲',
+  '�E' => '噞',
+  '�F' => '噷',
+  '�G' => '圜',
+  '�H' => '圛',
+  '�I' => '壈',
+  '�J' => '墽',
+  '�K' => '壉',
+  '�L' => '墿',
+  '�M' => '墺',
+  '�N' => '壂',
+  '�O' => '墼',
+  '�P' => '壆',
+  '�Q' => '嬗',
+  '�R' => '嬙',
+  '�S' => '嬛',
+  '�T' => '嬡',
+  '�U' => '嬔',
+  '�V' => '嬓',
+  '�W' => '嬐',
+  '�X' => '嬖',
+  '�Y' => '嬨',
+  '�Z' => '嬚',
+  '�[' => '嬠',
+  '�\\' => '嬞',
+  '�]' => '寯',
+  '�^' => '嶬',
+  '�_' => '嶱',
+  '�`' => '嶩',
+  '�a' => '嶧',
+  '�b' => '嶵',
+  '�c' => '嶰',
+  '�d' => '嶮',
+  '�e' => '嶪',
+  '�f' => '嶨',
+  '�g' => '嶲',
+  '�h' => '嶭',
+  '�i' => '嶯',
+  '�j' => '嶴',
+  '�k' => '幧',
+  '�l' => '幨',
+  '�m' => '幦',
+  '�n' => '幯',
+  '�o' => '廩',
+  '�p' => '廧',
+  '�q' => '廦',
+  '�r' => '廨',
+  '�s' => '廥',
+  '�t' => '彋',
+  '�u' => '徼',
+  '�v' => '憝',
+  '�w' => '憨',
+  '�x' => '憖',
+  '�y' => '懅',
+  '�z' => '憴',
+  '�{' => '懆',
+  '�|' => '懁',
+  '�}' => '懌',
+  '�~' => '憺',
+  '�' => '憿',
+  '�' => '憸',
+  '�' => '憌',
+  '�' => '擗',
+  '�' => '擖',
+  '�' => '擐',
+  '�' => '擏',
+  '�' => '擉',
+  '�' => '撽',
+  '�' => '撉',
+  '�' => '擃',
+  '�' => '擛',
+  '�' => '擳',
+  '�' => '擙',
+  '�' => '攳',
+  '�' => '敿',
+  '�' => '敼',
+  '�' => '斢',
+  '�' => '曈',
+  '�' => '暾',
+  '�' => '曀',
+  '�' => '曊',
+  '�' => '曋',
+  '�' => '曏',
+  '�' => '暽',
+  '�' => '暻',
+  '�' => '暺',
+  '�' => '曌',
+  '�' => '朣',
+  '�' => '樴',
+  '�' => '橦',
+  '��' => '橉',
+  '��' => '橧',
+  '��' => '樲',
+  '��' => '橨',
+  '��' => '樾',
+  '��' => '橝',
+  '��' => '橭',
+  '��' => '橶',
+  '��' => '橛',
+  '��' => '橑',
+  '��' => '樨',
+  '��' => '橚',
+  '��' => '樻',
+  '��' => '樿',
+  '��' => '橁',
+  '��' => '橪',
+  '��' => '橤',
+  '��' => '橐',
+  '��' => '橏',
+  '��' => '橔',
+  '��' => '橯',
+  '��' => '橩',
+  '��' => '橠',
+  '��' => '樼',
+  '��' => '橞',
+  '��' => '橖',
+  '��' => '橕',
+  '��' => '橍',
+  '��' => '橎',
+  '��' => '橆',
+  '��' => '歕',
+  '��' => '歔',
+  '��' => '歖',
+  '��' => '殧',
+  '��' => '殪',
+  '��' => '殫',
+  '��' => '毈',
+  '��' => '毇',
+  '��' => '氄',
+  '��' => '氃',
+  '��' => '氆',
+  '��' => '澭',
+  '��' => '濋',
+  '��' => '澣',
+  '��' => '濇',
+  '��' => '澼',
+  '��' => '濎',
+  '��' => '濈',
+  '��' => '潞',
+  '��' => '濄',
+  '��' => '澽',
+  '��' => '澞',
+  '��' => '濊',
+  '��' => '澨',
+  '��' => '瀄',
+  '��' => '澥',
+  '��' => '澮',
+  '��' => '澺',
+  '��' => '澬',
+  '��' => '澪',
+  '��' => '濏',
+  '��' => '澿',
+  '��' => '澸',
+  '�@' => '澢',
+  '�A' => '濉',
+  '�B' => '澫',
+  '�C' => '濍',
+  '�D' => '澯',
+  '�E' => '澲',
+  '�F' => '澰',
+  '�G' => '燅',
+  '�H' => '燂',
+  '�I' => '熿',
+  '�J' => '熸',
+  '�K' => '燖',
+  '�L' => '燀',
+  '�M' => '燁',
+  '�N' => '燋',
+  '�O' => '燔',
+  '�P' => '燊',
+  '�Q' => '燇',
+  '�R' => '燏',
+  '�S' => '熽',
+  '�T' => '燘',
+  '�U' => '熼',
+  '�V' => '燆',
+  '�W' => '燚',
+  '�X' => '燛',
+  '�Y' => '犝',
+  '�Z' => '犞',
+  '�[' => '獩',
+  '�\\' => '獦',
+  '�]' => '獧',
+  '�^' => '獬',
+  '�_' => '獥',
+  '�`' => '獫',
+  '�a' => '獪',
+  '�b' => '瑿',
+  '�c' => '璚',
+  '�d' => '璠',
+  '�e' => '璔',
+  '�f' => '璒',
+  '�g' => '璕',
+  '�h' => '璡',
+  '�i' => '甋',
+  '�j' => '疀',
+  '�k' => '瘯',
+  '�l' => '瘭',
+  '�m' => '瘱',
+  '�n' => '瘽',
+  '�o' => '瘳',
+  '�p' => '瘼',
+  '�q' => '瘵',
+  '�r' => '瘲',
+  '�s' => '瘰',
+  '�t' => '皻',
+  '�u' => '盦',
+  '�v' => '瞚',
+  '�w' => '瞝',
+  '�x' => '瞡',
+  '�y' => '瞜',
+  '�z' => '瞛',
+  '�{' => '瞢',
+  '�|' => '瞣',
+  '�}' => '瞕',
+  '�~' => '瞙',
+  '�' => '瞗',
+  '�' => '磝',
+  '�' => '磩',
+  '�' => '磥',
+  '�' => '磪',
+  '�' => '磞',
+  '�' => '磣',
+  '�' => '磛',
+  '�' => '磡',
+  '�' => '磢',
+  '�' => '磭',
+  '�' => '磟',
+  '�' => '磠',
+  '�' => '禤',
+  '�' => '穄',
+  '�' => '穈',
+  '�' => '穇',
+  '�' => '窶',
+  '�' => '窸',
+  '�' => '窵',
+  '�' => '窱',
+  '�' => '窷',
+  '�' => '篞',
+  '�' => '篣',
+  '�' => '篧',
+  '�' => '篝',
+  '�' => '篕',
+  '�' => '篥',
+  '�' => '篚',
+  '�' => '篨',
+  '�' => '篹',
+  '��' => '篔',
+  '��' => '篪',
+  '��' => '篢',
+  '��' => '篜',
+  '��' => '篫',
+  '��' => '篘',
+  '��' => '篟',
+  '��' => '糒',
+  '��' => '糔',
+  '��' => '糗',
+  '��' => '糐',
+  '��' => '糑',
+  '��' => '縒',
+  '��' => '縡',
+  '��' => '縗',
+  '��' => '縌',
+  '��' => '縟',
+  '��' => '縠',
+  '��' => '縓',
+  '��' => '縎',
+  '��' => '縜',
+  '��' => '縕',
+  '��' => '縚',
+  '��' => '縢',
+  '��' => '縋',
+  '��' => '縏',
+  '��' => '縖',
+  '��' => '縍',
+  '��' => '縔',
+  '��' => '縥',
+  '��' => '縤',
+  '��' => '罃',
+  '��' => '罻',
+  '��' => '罼',
+  '��' => '罺',
+  '��' => '羱',
+  '��' => '翯',
+  '��' => '耪',
+  '��' => '耩',
+  '��' => '聬',
+  '��' => '膱',
+  '��' => '膦',
+  '��' => '膮',
+  '��' => '膹',
+  '��' => '膵',
+  '��' => '膫',
+  '��' => '膰',
+  '��' => '膬',
+  '��' => '膴',
+  '��' => '膲',
+  '��' => '膷',
+  '��' => '膧',
+  '��' => '臲',
+  '��' => '艕',
+  '��' => '艖',
+  '��' => '艗',
+  '��' => '蕖',
+  '��' => '蕅',
+  '��' => '蕫',
+  '��' => '蕍',
+  '��' => '蕓',
+  '��' => '蕡',
+  '��' => '蕘',
+  '�@' => '蕀',
+  '�A' => '蕆',
+  '�B' => '蕤',
+  '�C' => '蕁',
+  '�D' => '蕢',
+  '�E' => '蕄',
+  '�F' => '蕑',
+  '�G' => '蕇',
+  '�H' => '蕣',
+  '�I' => '蔾',
+  '�J' => '蕛',
+  '�K' => '蕱',
+  '�L' => '蕎',
+  '�M' => '蕮',
+  '�N' => '蕵',
+  '�O' => '蕕',
+  '�P' => '蕧',
+  '�Q' => '蕠',
+  '�R' => '薌',
+  '�S' => '蕦',
+  '�T' => '蕝',
+  '�U' => '蕔',
+  '�V' => '蕥',
+  '�W' => '蕬',
+  '�X' => '虣',
+  '�Y' => '虥',
+  '�Z' => '虤',
+  '�[' => '螛',
+  '�\\' => '螏',
+  '�]' => '螗',
+  '�^' => '螓',
+  '�_' => '螒',
+  '�`' => '螈',
+  '�a' => '螁',
+  '�b' => '螖',
+  '�c' => '螘',
+  '�d' => '蝹',
+  '�e' => '螇',
+  '�f' => '螣',
+  '�g' => '螅',
+  '�h' => '螐',
+  '�i' => '螑',
+  '�j' => '螝',
+  '�k' => '螄',
+  '�l' => '螔',
+  '�m' => '螜',
+  '�n' => '螚',
+  '�o' => '螉',
+  '�p' => '褞',
+  '�q' => '褦',
+  '�r' => '褰',
+  '�s' => '褭',
+  '�t' => '褮',
+  '�u' => '褧',
+  '�v' => '褱',
+  '�w' => '褢',
+  '�x' => '褩',
+  '�y' => '褣',
+  '�z' => '褯',
+  '�{' => '褬',
+  '�|' => '褟',
+  '�}' => '觱',
+  '�~' => '諠',
+  '�' => '諢',
+  '�' => '諲',
+  '�' => '諴',
+  '�' => '諵',
+  '�' => '諝',
+  '�' => '謔',
+  '�' => '諤',
+  '�' => '諟',
+  '�' => '諰',
+  '�' => '諈',
+  '�' => '諞',
+  '�' => '諡',
+  '�' => '諨',
+  '�' => '諿',
+  '�' => '諯',
+  '�' => '諻',
+  '�' => '貑',
+  '�' => '貒',
+  '�' => '貐',
+  '�' => '賵',
+  '�' => '賮',
+  '�' => '賱',
+  '�' => '賰',
+  '�' => '賳',
+  '�' => '赬',
+  '�' => '赮',
+  '�' => '趥',
+  '�' => '趧',
+  '�' => '踳',
+  '�' => '踾',
+  '�' => '踸',
+  '��' => '蹀',
+  '��' => '蹅',
+  '��' => '踶',
+  '��' => '踼',
+  '��' => '踽',
+  '��' => '蹁',
+  '��' => '踰',
+  '��' => '踿',
+  '��' => '躽',
+  '��' => '輶',
+  '��' => '輮',
+  '��' => '輵',
+  '��' => '輲',
+  '��' => '輹',
+  '��' => '輷',
+  '��' => '輴',
+  '��' => '遶',
+  '��' => '遹',
+  '��' => '遻',
+  '��' => '邆',
+  '��' => '郺',
+  '��' => '鄳',
+  '��' => '鄵',
+  '��' => '鄶',
+  '��' => '醓',
+  '��' => '醐',
+  '��' => '醑',
+  '��' => '醍',
+  '��' => '醏',
+  '��' => '錧',
+  '��' => '錞',
+  '��' => '錈',
+  '��' => '錟',
+  '��' => '錆',
+  '��' => '錏',
+  '��' => '鍺',
+  '��' => '錸',
+  '��' => '錼',
+  '��' => '錛',
+  '��' => '錣',
+  '��' => '錒',
+  '��' => '錁',
+  '��' => '鍆',
+  '��' => '錭',
+  '��' => '錎',
+  '��' => '錍',
+  '��' => '鋋',
+  '��' => '錝',
+  '��' => '鋺',
+  '��' => '錥',
+  '��' => '錓',
+  '��' => '鋹',
+  '��' => '鋷',
+  '��' => '錴',
+  '��' => '錂',
+  '��' => '錤',
+  '��' => '鋿',
+  '��' => '錩',
+  '��' => '錹',
+  '��' => '錵',
+  '��' => '錪',
+  '��' => '錔',
+  '��' => '錌',
+  '�@' => '錋',
+  '�A' => '鋾',
+  '�B' => '錉',
+  '�C' => '錀',
+  '�D' => '鋻',
+  '�E' => '錖',
+  '�F' => '閼',
+  '�G' => '闍',
+  '�H' => '閾',
+  '�I' => '閹',
+  '�J' => '閺',
+  '�K' => '閶',
+  '�L' => '閿',
+  '�M' => '閵',
+  '�N' => '閽',
+  '�O' => '隩',
+  '�P' => '雔',
+  '�Q' => '霋',
+  '�R' => '霒',
+  '�S' => '霐',
+  '�T' => '鞙',
+  '�U' => '鞗',
+  '�V' => '鞔',
+  '�W' => '韰',
+  '�X' => '韸',
+  '�Y' => '頵',
+  '�Z' => '頯',
+  '�[' => '頲',
+  '�\\' => '餤',
+  '�]' => '餟',
+  '�^' => '餧',
+  '�_' => '餩',
+  '�`' => '馞',
+  '�a' => '駮',
+  '�b' => '駬',
+  '�c' => '駥',
+  '�d' => '駤',
+  '�e' => '駰',
+  '�f' => '駣',
+  '�g' => '駪',
+  '�h' => '駩',
+  '�i' => '駧',
+  '�j' => '骹',
+  '�k' => '骿',
+  '�l' => '骴',
+  '�m' => '骻',
+  '�n' => '髶',
+  '�o' => '髺',
+  '�p' => '髹',
+  '�q' => '髷',
+  '�r' => '鬳',
+  '�s' => '鮀',
+  '�t' => '鮅',
+  '�u' => '鮇',
+  '�v' => '魼',
+  '�w' => '魾',
+  '�x' => '魻',
+  '�y' => '鮂',
+  '�z' => '鮓',
+  '�{' => '鮒',
+  '�|' => '鮐',
+  '�}' => '魺',
+  '�~' => '鮕',
+  '�' => '魽',
+  '�' => '鮈',
+  '�' => '鴥',
+  '�' => '鴗',
+  '�' => '鴠',
+  '�' => '鴞',
+  '�' => '鴔',
+  '�' => '鴩',
+  '�' => '鴝',
+  '�' => '鴘',
+  '�' => '鴢',
+  '�' => '鴐',
+  '�' => '鴙',
+  '�' => '鴟',
+  '�' => '麈',
+  '�' => '麆',
+  '�' => '麇',
+  '�' => '麮',
+  '�' => '麭',
+  '�' => '黕',
+  '�' => '黖',
+  '�' => '黺',
+  '�' => '鼒',
+  '�' => '鼽',
+  '�' => '儦',
+  '�' => '儥',
+  '�' => '儢',
+  '�' => '儤',
+  '�' => '儠',
+  '�' => '儩',
+  '�' => '勴',
+  '��' => '嚓',
+  '��' => '嚌',
+  '��' => '嚍',
+  '��' => '嚆',
+  '��' => '嚄',
+  '��' => '嚃',
+  '��' => '噾',
+  '��' => '嚂',
+  '��' => '噿',
+  '��' => '嚁',
+  '��' => '壖',
+  '��' => '壔',
+  '��' => '壏',
+  '��' => '壒',
+  '��' => '嬭',
+  '��' => '嬥',
+  '��' => '嬲',
+  '��' => '嬣',
+  '��' => '嬬',
+  '��' => '嬧',
+  '��' => '嬦',
+  '��' => '嬯',
+  '��' => '嬮',
+  '��' => '孻',
+  '��' => '寱',
+  '��' => '寲',
+  '��' => '嶷',
+  '��' => '幬',
+  '��' => '幪',
+  '��' => '徾',
+  '��' => '徻',
+  '��' => '懃',
+  '��' => '憵',
+  '��' => '憼',
+  '��' => '懧',
+  '��' => '懠',
+  '��' => '懥',
+  '��' => '懤',
+  '��' => '懨',
+  '��' => '懞',
+  '��' => '擯',
+  '��' => '擩',
+  '��' => '擣',
+  '��' => '擫',
+  '��' => '擤',
+  '��' => '擨',
+  '��' => '斁',
+  '��' => '斀',
+  '��' => '斶',
+  '��' => '旚',
+  '��' => '曒',
+  '��' => '檍',
+  '��' => '檖',
+  '��' => '檁',
+  '��' => '檥',
+  '��' => '檉',
+  '��' => '檟',
+  '��' => '檛',
+  '��' => '檡',
+  '��' => '檞',
+  '��' => '檇',
+  '��' => '檓',
+  '��' => '檎',
+  '�@' => '檕',
+  '�A' => '檃',
+  '�B' => '檨',
+  '�C' => '檤',
+  '�D' => '檑',
+  '�E' => '橿',
+  '�F' => '檦',
+  '�G' => '檚',
+  '�H' => '檅',
+  '�I' => '檌',
+  '�J' => '檒',
+  '�K' => '歛',
+  '�L' => '殭',
+  '�M' => '氉',
+  '�N' => '濌',
+  '�O' => '澩',
+  '�P' => '濴',
+  '�Q' => '濔',
+  '�R' => '濣',
+  '�S' => '濜',
+  '�T' => '濭',
+  '�U' => '濧',
+  '�V' => '濦',
+  '�W' => '濞',
+  '�X' => '濲',
+  '�Y' => '濝',
+  '�Z' => '濢',
+  '�[' => '濨',
+  '�\\' => '燡',
+  '�]' => '燱',
+  '�^' => '燨',
+  '�_' => '燲',
+  '�`' => '燤',
+  '�a' => '燰',
+  '�b' => '燢',
+  '�c' => '獳',
+  '�d' => '獮',
+  '�e' => '獯',
+  '�f' => '璗',
+  '�g' => '璲',
+  '�h' => '璫',
+  '�i' => '璐',
+  '�j' => '璪',
+  '�k' => '璭',
+  '�l' => '璱',
+  '�m' => '璥',
+  '�n' => '璯',
+  '�o' => '甐',
+  '�p' => '甑',
+  '�q' => '甒',
+  '�r' => '甏',
+  '�s' => '疄',
+  '�t' => '癃',
+  '�u' => '癈',
+  '�v' => '癉',
+  '�w' => '癇',
+  '�x' => '皤',
+  '�y' => '盩',
+  '�z' => '瞵',
+  '�{' => '瞫',
+  '�|' => '瞲',
+  '�}' => '瞷',
+  '�~' => '瞶',
+  '��' => '瞴',
+  '��' => '瞱',
+  '��' => '瞨',
+  '��' => '矰',
+  '��' => '磳',
+  '��' => '磽',
+  '��' => '礂',
+  '��' => '磻',
+  '��' => '磼',
+  '��' => '磲',
+  '��' => '礅',
+  '��' => '磹',
+  '��' => '磾',
+  '��' => '礄',
+  '��' => '禫',
+  '��' => '禨',
+  '��' => '穜',
+  '��' => '穛',
+  '��' => '穖',
+  '��' => '穘',
+  '��' => '穔',
+  '��' => '穚',
+  '��' => '窾',
+  '��' => '竀',
+  '��' => '竁',
+  '��' => '簅',
+  '��' => '簏',
+  '��' => '篲',
+  '��' => '簀',
+  '��' => '篿',
+  '��' => '篻',
+  '��' => '簎',
+  '��' => '篴',
+  '��' => '簋',
+  '��' => '篳',
+  '��' => '簂',
+  '��' => '簉',
+  '��' => '簃',
+  '��' => '簁',
+  '��' => '篸',
+  '��' => '篽',
+  '��' => '簆',
+  '��' => '篰',
+  '��' => '篱',
+  '��' => '簐',
+  '��' => '簊',
+  '��' => '糨',
+  '��' => '縭',
+  '��' => '縼',
+  '��' => '繂',
+  '��' => '縳',
+  '��' => '顈',
+  '��' => '縸',
+  '��' => '縪',
+  '��' => '繉',
+  '��' => '繀',
+  '��' => '繇',
+  '��' => '縩',
+  '��' => '繌',
+  '��' => '縰',
+  '��' => '縻',
+  '��' => '縶',
+  '��' => '繄',
+  '��' => '縺',
+  '��' => '罅',
+  '��' => '罿',
+  '��' => '罾',
+  '��' => '罽',
+  '��' => '翴',
+  '��' => '翲',
+  '��' => '耬',
+  '��' => '膻',
+  '��' => '臄',
+  '��' => '臌',
+  '��' => '臊',
+  '��' => '臅',
+  '��' => '臇',
+  '��' => '膼',
+  '��' => '臩',
+  '��' => '艛',
+  '��' => '艚',
+  '��' => '艜',
+  '��' => '薃',
+  '��' => '薀',
+  '��' => '薏',
+  '��' => '薧',
+  '��' => '薕',
+  '��' => '薠',
+  '��' => '薋',
+  '��' => '薣',
+  '��' => '蕻',
+  '��' => '薤',
+  '��' => '薚',
+  '��' => '薞',
+  '�@' => '蕷',
+  '�A' => '蕼',
+  '�B' => '薉',
+  '�C' => '薡',
+  '�D' => '蕺',
+  '�E' => '蕸',
+  '�F' => '蕗',
+  '�G' => '薎',
+  '�H' => '薖',
+  '�I' => '薆',
+  '�J' => '薍',
+  '�K' => '薙',
+  '�L' => '薝',
+  '�M' => '薁',
+  '�N' => '薢',
+  '�O' => '薂',
+  '�P' => '薈',
+  '�Q' => '薅',
+  '�R' => '蕹',
+  '�S' => '蕶',
+  '�T' => '薘',
+  '�U' => '薐',
+  '�V' => '薟',
+  '�W' => '虨',
+  '�X' => '螾',
+  '�Y' => '螪',
+  '�Z' => '螭',
+  '�[' => '蟅',
+  '�\\' => '螰',
+  '�]' => '螬',
+  '�^' => '螹',
+  '�_' => '螵',
+  '�`' => '螼',
+  '�a' => '螮',
+  '�b' => '蟉',
+  '�c' => '蟃',
+  '�d' => '蟂',
+  '�e' => '蟌',
+  '�f' => '螷',
+  '�g' => '螯',
+  '�h' => '蟄',
+  '�i' => '蟊',
+  '�j' => '螴',
+  '�k' => '螶',
+  '�l' => '螿',
+  '�m' => '螸',
+  '�n' => '螽',
+  '�o' => '蟞',
+  '�p' => '螲',
+  '�q' => '褵',
+  '�r' => '褳',
+  '�s' => '褼',
+  '�t' => '褾',
+  '�u' => '襁',
+  '�v' => '襒',
+  '�w' => '褷',
+  '�x' => '襂',
+  '�y' => '覭',
+  '�z' => '覯',
+  '�{' => '覮',
+  '�|' => '觲',
+  '�}' => '觳',
+  '�~' => '謞',
+  '�' => '謘',
+  '�' => '謖',
+  '�' => '謑',
+  '�' => '謅',
+  '�' => '謋',
+  '�' => '謢',
+  '�' => '謏',
+  '�' => '謒',
+  '�' => '謕',
+  '�' => '謇',
+  '�' => '謍',
+  '�' => '謈',
+  '�' => '謆',
+  '�' => '謜',
+  '�' => '謓',
+  '�' => '謚',
+  '�' => '豏',
+  '�' => '豰',
+  '�' => '豲',
+  '�' => '豱',
+  '�' => '豯',
+  '�' => '貕',
+  '�' => '貔',
+  '�' => '賹',
+  '�' => '赯',
+  '�' => '蹎',
+  '�' => '蹍',
+  '�' => '蹓',
+  '�' => '蹐',
+  '�' => '蹌',
+  '�' => '蹇',
+  '��' => '轃',
+  '��' => '轀',
+  '��' => '邅',
+  '��' => '遾',
+  '��' => '鄸',
+  '��' => '醚',
+  '��' => '醢',
+  '��' => '醛',
+  '��' => '醙',
+  '��' => '醟',
+  '��' => '醡',
+  '��' => '醝',
+  '��' => '醠',
+  '��' => '鎡',
+  '��' => '鎃',
+  '��' => '鎯',
+  '��' => '鍤',
+  '��' => '鍖',
+  '��' => '鍇',
+  '��' => '鍼',
+  '��' => '鍘',
+  '��' => '鍜',
+  '��' => '鍶',
+  '��' => '鍉',
+  '��' => '鍐',
+  '��' => '鍑',
+  '��' => '鍠',
+  '��' => '鍭',
+  '��' => '鎏',
+  '��' => '鍌',
+  '��' => '鍪',
+  '��' => '鍹',
+  '��' => '鍗',
+  '��' => '鍕',
+  '��' => '鍒',
+  '��' => '鍏',
+  '��' => '鍱',
+  '��' => '鍷',
+  '��' => '鍻',
+  '��' => '鍡',
+  '��' => '鍞',
+  '��' => '鍣',
+  '��' => '鍧',
+  '��' => '鎀',
+  '��' => '鍎',
+  '��' => '鍙',
+  '��' => '闇',
+  '��' => '闀',
+  '��' => '闉',
+  '��' => '闃',
+  '��' => '闅',
+  '��' => '閷',
+  '��' => '隮',
+  '��' => '隰',
+  '��' => '隬',
+  '��' => '霠',
+  '��' => '霟',
+  '��' => '霘',
+  '��' => '霝',
+  '��' => '霙',
+  '��' => '鞚',
+  '��' => '鞡',
+  '��' => '鞜',
+  '�@' => '鞞',
+  '�A' => '鞝',
+  '�B' => '韕',
+  '�C' => '韔',
+  '�D' => '韱',
+  '�E' => '顁',
+  '�F' => '顄',
+  '�G' => '顊',
+  '�H' => '顉',
+  '�I' => '顅',
+  '�J' => '顃',
+  '�K' => '餥',
+  '�L' => '餫',
+  '�M' => '餬',
+  '�N' => '餪',
+  '�O' => '餳',
+  '�P' => '餲',
+  '�Q' => '餯',
+  '�R' => '餭',
+  '�S' => '餱',
+  '�T' => '餰',
+  '�U' => '馘',
+  '�V' => '馣',
+  '�W' => '馡',
+  '�X' => '騂',
+  '�Y' => '駺',
+  '�Z' => '駴',
+  '�[' => '駷',
+  '�\\' => '駹',
+  '�]' => '駸',
+  '�^' => '駶',
+  '�_' => '駻',
+  '�`' => '駽',
+  '�a' => '駾',
+  '�b' => '駼',
+  '�c' => '騃',
+  '�d' => '骾',
+  '�e' => '髾',
+  '�f' => '髽',
+  '�g' => '鬁',
+  '�h' => '髼',
+  '�i' => '魈',
+  '�j' => '鮚',
+  '�k' => '鮨',
+  '�l' => '鮞',
+  '�m' => '鮛',
+  '�n' => '鮦',
+  '�o' => '鮡',
+  '�p' => '鮥',
+  '�q' => '鮤',
+  '�r' => '鮆',
+  '�s' => '鮢',
+  '�t' => '鮠',
+  '�u' => '鮯',
+  '�v' => '鴳',
+  '�w' => '鵁',
+  '�x' => '鵧',
+  '�y' => '鴶',
+  '�z' => '鴮',
+  '�{' => '鴯',
+  '�|' => '鴱',
+  '�}' => '鴸',
+  '�~' => '鴰',
+  '�' => '鵅',
+  '�' => '鵂',
+  '�' => '鵃',
+  '�' => '鴾',
+  '�' => '鴷',
+  '�' => '鵀',
+  '�' => '鴽',
+  '�' => '翵',
+  '�' => '鴭',
+  '�' => '麊',
+  '�' => '麉',
+  '�' => '麍',
+  '�' => '麰',
+  '�' => '黈',
+  '�' => '黚',
+  '�' => '黻',
+  '�' => '黿',
+  '�' => '鼤',
+  '�' => '鼣',
+  '�' => '鼢',
+  '�' => '齔',
+  '�' => '龠',
+  '�' => '儱',
+  '�' => '儭',
+  '�' => '儮',
+  '�' => '嚘',
+  '�' => '嚜',
+  '�' => '嚗',
+  '�' => '嚚',
+  '�' => '嚝',
+  '�' => '嚙',
+  '��' => '奰',
+  '��' => '嬼',
+  '��' => '屩',
+  '��' => '屪',
+  '��' => '巀',
+  '��' => '幭',
+  '��' => '幮',
+  '��' => '懘',
+  '��' => '懟',
+  '��' => '懭',
+  '��' => '懮',
+  '��' => '懱',
+  '��' => '懪',
+  '��' => '懰',
+  '��' => '懫',
+  '��' => '懖',
+  '��' => '懩',
+  '��' => '擿',
+  '��' => '攄',
+  '��' => '擽',
+  '��' => '擸',
+  '��' => '攁',
+  '��' => '攃',
+  '��' => '擼',
+  '��' => '斔',
+  '��' => '旛',
+  '��' => '曚',
+  '��' => '曛',
+  '��' => '曘',
+  '��' => '櫅',
+  '��' => '檹',
+  '��' => '檽',
+  '��' => '櫡',
+  '��' => '櫆',
+  '��' => '檺',
+  '��' => '檶',
+  '��' => '檷',
+  '��' => '櫇',
+  '��' => '檴',
+  '��' => '檭',
+  '��' => '歞',
+  '��' => '毉',
+  '��' => '氋',
+  '��' => '瀇',
+  '��' => '瀌',
+  '��' => '瀍',
+  '��' => '瀁',
+  '��' => '瀅',
+  '��' => '瀔',
+  '��' => '瀎',
+  '��' => '濿',
+  '��' => '瀀',
+  '��' => '濻',
+  '��' => '瀦',
+  '��' => '濼',
+  '��' => '濷',
+  '��' => '瀊',
+  '��' => '爁',
+  '��' => '燿',
+  '��' => '燹',
+  '��' => '爃',
+  '��' => '燽',
+  '��' => '獶',
+  '�@' => '璸',
+  '�A' => '瓀',
+  '�B' => '璵',
+  '�C' => '瓁',
+  '�D' => '璾',
+  '�E' => '璶',
+  '�F' => '璻',
+  '�G' => '瓂',
+  '�H' => '甔',
+  '�I' => '甓',
+  '�J' => '癜',
+  '�K' => '癤',
+  '�L' => '癙',
+  '�M' => '癐',
+  '�N' => '癓',
+  '�O' => '癗',
+  '�P' => '癚',
+  '�Q' => '皦',
+  '�R' => '皽',
+  '�S' => '盬',
+  '�T' => '矂',
+  '�U' => '瞺',
+  '�V' => '磿',
+  '�W' => '礌',
+  '�X' => '礓',
+  '�Y' => '礔',
+  '�Z' => '礉',
+  '�[' => '礐',
+  '�\\' => '礒',
+  '�]' => '礑',
+  '�^' => '禭',
+  '�_' => '禬',
+  '�`' => '穟',
+  '�a' => '簜',
+  '�b' => '簩',
+  '�c' => '簙',
+  '�d' => '簠',
+  '�e' => '簟',
+  '�f' => '簭',
+  '�g' => '簝',
+  '�h' => '簦',
+  '�i' => '簨',
+  '�j' => '簢',
+  '�k' => '簥',
+  '�l' => '簰',
+  '�m' => '繜',
+  '�n' => '繐',
+  '�o' => '繖',
+  '�p' => '繣',
+  '�q' => '繘',
+  '�r' => '繢',
+  '�s' => '繟',
+  '�t' => '繑',
+  '�u' => '繠',
+  '�v' => '繗',
+  '�w' => '繓',
+  '�x' => '羵',
+  '�y' => '羳',
+  '�z' => '翷',
+  '�{' => '翸',
+  '�|' => '聵',
+  '�}' => '臑',
+  '�~' => '臒',
+  '�' => '臐',
+  '�' => '艟',
+  '�' => '艞',
+  '�' => '薴',
+  '�' => '藆',
+  '�' => '藀',
+  '�' => '藃',
+  '�' => '藂',
+  '�' => '薳',
+  '�' => '薵',
+  '�' => '薽',
+  '�' => '藇',
+  '�' => '藄',
+  '�' => '薿',
+  '�' => '藋',
+  '�' => '藎',
+  '�' => '藈',
+  '�' => '藅',
+  '�' => '薱',
+  '�' => '薶',
+  '�' => '藒',
+  '�' => '蘤',
+  '�' => '薸',
+  '�' => '薷',
+  '�' => '薾',
+  '�' => '虩',
+  '�' => '蟧',
+  '�' => '蟦',
+  '�' => '蟢',
+  '�' => '蟛',
+  '�' => '蟫',
+  '��' => '蟪',
+  '��' => '蟥',
+  '��' => '蟟',
+  '��' => '蟳',
+  '��' => '蟤',
+  '��' => '蟔',
+  '��' => '蟜',
+  '��' => '蟓',
+  '��' => '蟭',
+  '��' => '蟘',
+  '��' => '蟣',
+  '��' => '螤',
+  '��' => '蟗',
+  '��' => '蟙',
+  '��' => '蠁',
+  '��' => '蟴',
+  '��' => '蟨',
+  '��' => '蟝',
+  '��' => '襓',
+  '��' => '襋',
+  '��' => '襏',
+  '��' => '襌',
+  '��' => '襆',
+  '��' => '襐',
+  '��' => '襑',
+  '��' => '襉',
+  '��' => '謪',
+  '��' => '謧',
+  '��' => '謣',
+  '��' => '謳',
+  '��' => '謰',
+  '��' => '謵',
+  '��' => '譇',
+  '��' => '謯',
+  '��' => '謼',
+  '��' => '謾',
+  '��' => '謱',
+  '��' => '謥',
+  '��' => '謷',
+  '��' => '謦',
+  '��' => '謶',
+  '��' => '謮',
+  '��' => '謤',
+  '��' => '謻',
+  '��' => '謽',
+  '��' => '謺',
+  '��' => '豂',
+  '��' => '豵',
+  '��' => '貙',
+  '��' => '貘',
+  '��' => '貗',
+  '��' => '賾',
+  '��' => '贄',
+  '��' => '贂',
+  '��' => '贀',
+  '��' => '蹜',
+  '��' => '蹢',
+  '��' => '蹠',
+  '��' => '蹗',
+  '��' => '蹖',
+  '��' => '蹞',
+  '��' => '蹥',
+  '��' => '蹧',
+  '�@' => '蹛',
+  '�A' => '蹚',
+  '�B' => '蹡',
+  '�C' => '蹝',
+  '�D' => '蹩',
+  '�E' => '蹔',
+  '�F' => '轆',
+  '�G' => '轇',
+  '�H' => '轈',
+  '�I' => '轋',
+  '�J' => '鄨',
+  '�K' => '鄺',
+  '�L' => '鄻',
+  '�M' => '鄾',
+  '�N' => '醨',
+  '�O' => '醥',
+  '�P' => '醧',
+  '�Q' => '醯',
+  '�R' => '醪',
+  '�S' => '鎵',
+  '�T' => '鎌',
+  '�U' => '鎒',
+  '�V' => '鎷',
+  '�W' => '鎛',
+  '�X' => '鎝',
+  '�Y' => '鎉',
+  '�Z' => '鎧',
+  '�[' => '鎎',
+  '�\\' => '鎪',
+  '�]' => '鎞',
+  '�^' => '鎦',
+  '�_' => '鎕',
+  '�`' => '鎈',
+  '�a' => '鎙',
+  '�b' => '鎟',
+  '�c' => '鎍',
+  '�d' => '鎱',
+  '�e' => '鎑',
+  '�f' => '鎲',
+  '�g' => '鎤',
+  '�h' => '鎨',
+  '�i' => '鎴',
+  '�j' => '鎣',
+  '�k' => '鎥',
+  '�l' => '闒',
+  '�m' => '闓',
+  '�n' => '闑',
+  '�o' => '隳',
+  '�p' => '雗',
+  '�q' => '雚',
+  '�r' => '巂',
+  '�s' => '雟',
+  '�t' => '雘',
+  '�u' => '雝',
+  '�v' => '霣',
+  '�w' => '霢',
+  '�x' => '霥',
+  '�y' => '鞬',
+  '�z' => '鞮',
+  '�{' => '鞨',
+  '�|' => '鞫',
+  '�}' => '鞤',
+  '�~' => '鞪',
+  '�' => '鞢',
+  '�' => '鞥',
+  '�' => '韗',
+  '�' => '韙',
+  '�' => '韖',
+  '�' => '韘',
+  '�' => '韺',
+  '�' => '顐',
+  '�' => '顑',
+  '�' => '顒',
+  '�' => '颸',
+  '�' => '饁',
+  '�' => '餼',
+  '�' => '餺',
+  '�' => '騏',
+  '�' => '騋',
+  '�' => '騉',
+  '�' => '騍',
+  '�' => '騄',
+  '�' => '騑',
+  '�' => '騊',
+  '�' => '騅',
+  '�' => '騇',
+  '�' => '騆',
+  '�' => '髀',
+  '�' => '髜',
+  '�' => '鬈',
+  '�' => '鬄',
+  '�' => '鬅',
+  '�' => '鬩',
+  '�' => '鬵',
+  '��' => '魊',
+  '��' => '魌',
+  '��' => '魋',
+  '��' => '鯇',
+  '��' => '鯆',
+  '��' => '鯃',
+  '��' => '鮿',
+  '��' => '鯁',
+  '��' => '鮵',
+  '��' => '鮸',
+  '��' => '鯓',
+  '��' => '鮶',
+  '��' => '鯄',
+  '��' => '鮹',
+  '��' => '鮽',
+  '��' => '鵜',
+  '��' => '鵓',
+  '��' => '鵏',
+  '��' => '鵊',
+  '��' => '鵛',
+  '��' => '鵋',
+  '��' => '鵙',
+  '��' => '鵖',
+  '��' => '鵌',
+  '��' => '鵗',
+  '��' => '鵒',
+  '��' => '鵔',
+  '��' => '鵟',
+  '��' => '鵘',
+  '��' => '鵚',
+  '��' => '麎',
+  '��' => '麌',
+  '��' => '黟',
+  '��' => '鼁',
+  '��' => '鼀',
+  '��' => '鼖',
+  '��' => '鼥',
+  '��' => '鼫',
+  '��' => '鼪',
+  '��' => '鼩',
+  '��' => '鼨',
+  '��' => '齌',
+  '��' => '齕',
+  '��' => '儴',
+  '��' => '儵',
+  '��' => '劖',
+  '��' => '勷',
+  '��' => '厴',
+  '��' => '嚫',
+  '��' => '嚭',
+  '��' => '嚦',
+  '��' => '嚧',
+  '��' => '嚪',
+  '��' => '嚬',
+  '��' => '壚',
+  '��' => '壝',
+  '��' => '壛',
+  '��' => '夒',
+  '��' => '嬽',
+  '��' => '嬾',
+  '��' => '嬿',
+  '��' => '巃',
+  '��' => '幰',
+  '�@' => '徿',
+  '�A' => '懻',
+  '�B' => '攇',
+  '�C' => '攐',
+  '�D' => '攍',
+  '�E' => '攉',
+  '�F' => '攌',
+  '�G' => '攎',
+  '�H' => '斄',
+  '�I' => '旞',
+  '�J' => '旝',
+  '�K' => '曞',
+  '�L' => '櫧',
+  '�M' => '櫠',
+  '�N' => '櫌',
+  '�O' => '櫑',
+  '�P' => '櫙',
+  '�Q' => '櫋',
+  '�R' => '櫟',
+  '�S' => '櫜',
+  '�T' => '櫐',
+  '�U' => '櫫',
+  '�V' => '櫏',
+  '�W' => '櫍',
+  '�X' => '櫞',
+  '�Y' => '歠',
+  '�Z' => '殰',
+  '�[' => '氌',
+  '�\\' => '瀙',
+  '�]' => '瀧',
+  '�^' => '瀠',
+  '�_' => '瀖',
+  '�`' => '瀫',
+  '�a' => '瀡',
+  '�b' => '瀢',
+  '�c' => '瀣',
+  '�d' => '瀩',
+  '�e' => '瀗',
+  '�f' => '瀤',
+  '�g' => '瀜',
+  '�h' => '瀪',
+  '�i' => '爌',
+  '�j' => '爊',
+  '�k' => '爇',
+  '�l' => '爂',
+  '�m' => '爅',
+  '�n' => '犥',
+  '�o' => '犦',
+  '�p' => '犤',
+  '�q' => '犣',
+  '�r' => '犡',
+  '�s' => '瓋',
+  '�t' => '瓅',
+  '�u' => '璷',
+  '�v' => '瓃',
+  '�w' => '甖',
+  '�x' => '癠',
+  '�y' => '矉',
+  '�z' => '矊',
+  '�{' => '矄',
+  '�|' => '矱',
+  '�}' => '礝',
+  '�~' => '礛',
+  '�' => '礡',
+  '�' => '礜',
+  '�' => '礗',
+  '�' => '礞',
+  '�' => '禰',
+  '�' => '穧',
+  '�' => '穨',
+  '�' => '簳',
+  '�' => '簼',
+  '�' => '簹',
+  '�' => '簬',
+  '�' => '簻',
+  '�' => '糬',
+  '�' => '糪',
+  '�' => '繶',
+  '�' => '繵',
+  '�' => '繸',
+  '�' => '繰',
+  '�' => '繷',
+  '�' => '繯',
+  '�' => '繺',
+  '�' => '繲',
+  '�' => '繴',
+  '�' => '繨',
+  '�' => '罋',
+  '�' => '罊',
+  '�' => '羃',
+  '�' => '羆',
+  '�' => '羷',
+  '�' => '翽',
+  '�' => '翾',
+  '��' => '聸',
+  '��' => '臗',
+  '��' => '臕',
+  '��' => '艤',
+  '��' => '艡',
+  '��' => '艣',
+  '��' => '藫',
+  '��' => '藱',
+  '��' => '藭',
+  '��' => '藙',
+  '��' => '藡',
+  '��' => '藨',
+  '��' => '藚',
+  '��' => '藗',
+  '��' => '藬',
+  '��' => '藲',
+  '��' => '藸',
+  '��' => '藘',
+  '��' => '藟',
+  '��' => '藣',
+  '��' => '藜',
+  '��' => '藑',
+  '��' => '藰',
+  '��' => '藦',
+  '��' => '藯',
+  '��' => '藞',
+  '��' => '藢',
+  '��' => '蠀',
+  '��' => '蟺',
+  '��' => '蠃',
+  '��' => '蟶',
+  '��' => '蟷',
+  '��' => '蠉',
+  '��' => '蠌',
+  '��' => '蠋',
+  '��' => '蠆',
+  '��' => '蟼',
+  '��' => '蠈',
+  '��' => '蟿',
+  '��' => '蠊',
+  '��' => '蠂',
+  '��' => '襢',
+  '��' => '襚',
+  '��' => '襛',
+  '��' => '襗',
+  '��' => '襡',
+  '��' => '襜',
+  '��' => '襘',
+  '��' => '襝',
+  '��' => '襙',
+  '��' => '覈',
+  '��' => '覷',
+  '��' => '覶',
+  '��' => '觶',
+  '��' => '譐',
+  '��' => '譈',
+  '��' => '譊',
+  '��' => '譀',
+  '��' => '譓',
+  '��' => '譖',
+  '��' => '譔',
+  '��' => '譋',
+  '��' => '譕',
+  '�@' => '譑',
+  '�A' => '譂',
+  '�B' => '譒',
+  '�C' => '譗',
+  '�D' => '豃',
+  '�E' => '豷',
+  '�F' => '豶',
+  '�G' => '貚',
+  '�H' => '贆',
+  '�I' => '贇',
+  '�J' => '贉',
+  '�K' => '趬',
+  '�L' => '趪',
+  '�M' => '趭',
+  '�N' => '趫',
+  '�O' => '蹭',
+  '�P' => '蹸',
+  '�Q' => '蹳',
+  '�R' => '蹪',
+  '�S' => '蹯',
+  '�T' => '蹻',
+  '�U' => '軂',
+  '�V' => '轒',
+  '�W' => '轑',
+  '�X' => '轏',
+  '�Y' => '轐',
+  '�Z' => '轓',
+  '�[' => '辴',
+  '�\\' => '酀',
+  '�]' => '鄿',
+  '�^' => '醰',
+  '�_' => '醭',
+  '�`' => '鏞',
+  '�a' => '鏇',
+  '�b' => '鏏',
+  '�c' => '鏂',
+  '�d' => '鏚',
+  '�e' => '鏐',
+  '�f' => '鏹',
+  '�g' => '鏬',
+  '�h' => '鏌',
+  '�i' => '鏙',
+  '�j' => '鎩',
+  '�k' => '鏦',
+  '�l' => '鏊',
+  '�m' => '鏔',
+  '�n' => '鏮',
+  '�o' => '鏣',
+  '�p' => '鏕',
+  '�q' => '鏄',
+  '�r' => '鏎',
+  '�s' => '鏀',
+  '�t' => '鏒',
+  '�u' => '鏧',
+  '�v' => '镽',
+  '�w' => '闚',
+  '�x' => '闛',
+  '�y' => '雡',
+  '�z' => '霩',
+  '�{' => '霫',
+  '�|' => '霬',
+  '�}' => '霨',
+  '�~' => '霦',
+  '�' => '鞳',
+  '�' => '鞷',
+  '�' => '鞶',
+  '�' => '韝',
+  '�' => '韞',
+  '�' => '韟',
+  '�' => '顜',
+  '�' => '顙',
+  '�' => '顝',
+  '�' => '顗',
+  '�' => '颿',
+  '�' => '颽',
+  '�' => '颻',
+  '�' => '颾',
+  '�' => '饈',
+  '�' => '饇',
+  '�' => '饃',
+  '�' => '馦',
+  '�' => '馧',
+  '�' => '騚',
+  '�' => '騕',
+  '�' => '騥',
+  '�' => '騝',
+  '�' => '騤',
+  '�' => '騛',
+  '�' => '騢',
+  '�' => '騠',
+  '�' => '騧',
+  '�' => '騣',
+  '�' => '騞',
+  '�' => '騜',
+  '��' => '騔',
+  '��' => '髂',
+  '��' => '鬋',
+  '��' => '鬊',
+  '��' => '鬎',
+  '��' => '鬌',
+  '��' => '鬷',
+  '��' => '鯪',
+  '��' => '鯫',
+  '��' => '鯠',
+  '��' => '鯞',
+  '��' => '鯤',
+  '��' => '鯦',
+  '��' => '鯢',
+  '��' => '鯰',
+  '��' => '鯔',
+  '��' => '鯗',
+  '��' => '鯬',
+  '��' => '鯜',
+  '��' => '鯙',
+  '��' => '鯥',
+  '��' => '鯕',
+  '��' => '鯡',
+  '��' => '鯚',
+  '��' => '鵷',
+  '��' => '鶁',
+  '��' => '鶊',
+  '��' => '鶄',
+  '��' => '鶈',
+  '��' => '鵱',
+  '��' => '鶀',
+  '��' => '鵸',
+  '��' => '鶆',
+  '��' => '鶋',
+  '��' => '鶌',
+  '��' => '鵽',
+  '��' => '鵫',
+  '��' => '鵴',
+  '��' => '鵵',
+  '��' => '鵰',
+  '��' => '鵩',
+  '��' => '鶅',
+  '��' => '鵳',
+  '��' => '鵻',
+  '��' => '鶂',
+  '��' => '鵯',
+  '��' => '鵹',
+  '��' => '鵿',
+  '��' => '鶇',
+  '��' => '鵨',
+  '��' => '麔',
+  '��' => '麑',
+  '��' => '黀',
+  '��' => '黼',
+  '��' => '鼭',
+  '��' => '齀',
+  '��' => '齁',
+  '��' => '齍',
+  '��' => '齖',
+  '��' => '齗',
+  '��' => '齘',
+  '��' => '匷',
+  '��' => '嚲',
+  '�@' => '嚵',
+  '�A' => '嚳',
+  '�B' => '壣',
+  '�C' => '孅',
+  '�D' => '巆',
+  '�E' => '巇',
+  '�F' => '廮',
+  '�G' => '廯',
+  '�H' => '忀',
+  '�I' => '忁',
+  '�J' => '懹',
+  '�K' => '攗',
+  '�L' => '攖',
+  '�M' => '攕',
+  '�N' => '攓',
+  '�O' => '旟',
+  '�P' => '曨',
+  '�Q' => '曣',
+  '�R' => '曤',
+  '�S' => '櫳',
+  '�T' => '櫰',
+  '�U' => '櫪',
+  '�V' => '櫨',
+  '�W' => '櫹',
+  '�X' => '櫱',
+  '�Y' => '櫮',
+  '�Z' => '櫯',
+  '�[' => '瀼',
+  '�\\' => '瀵',
+  '�]' => '瀯',
+  '�^' => '瀷',
+  '�_' => '瀴',
+  '�`' => '瀱',
+  '�a' => '灂',
+  '�b' => '瀸',
+  '�c' => '瀿',
+  '�d' => '瀺',
+  '�e' => '瀹',
+  '�f' => '灀',
+  '�g' => '瀻',
+  '�h' => '瀳',
+  '�i' => '灁',
+  '�j' => '爓',
+  '�k' => '爔',
+  '�l' => '犨',
+  '�m' => '獽',
+  '�n' => '獼',
+  '�o' => '璺',
+  '�p' => '皫',
+  '�q' => '皪',
+  '�r' => '皾',
+  '�s' => '盭',
+  '�t' => '矌',
+  '�u' => '矎',
+  '�v' => '矏',
+  '�w' => '矍',
+  '�x' => '矲',
+  '�y' => '礥',
+  '�z' => '礣',
+  '�{' => '礧',
+  '�|' => '礨',
+  '�}' => '礤',
+  '�~' => '礩',
+  '��' => '禲',
+  '��' => '穮',
+  '��' => '穬',
+  '��' => '穭',
+  '��' => '竷',
+  '��' => '籉',
+  '��' => '籈',
+  '��' => '籊',
+  '��' => '籇',
+  '��' => '籅',
+  '��' => '糮',
+  '��' => '繻',
+  '��' => '繾',
+  '��' => '纁',
+  '��' => '纀',
+  '��' => '羺',
+  '��' => '翿',
+  '��' => '聹',
+  '��' => '臛',
+  '��' => '臙',
+  '��' => '舋',
+  '��' => '艨',
+  '��' => '艩',
+  '��' => '蘢',
+  '��' => '藿',
+  '��' => '蘁',
+  '��' => '藾',
+  '��' => '蘛',
+  '��' => '蘀',
+  '��' => '藶',
+  '��' => '蘄',
+  '��' => '蘉',
+  '��' => '蘅',
+  '��' => '蘌',
+  '��' => '藽',
+  '��' => '蠙',
+  '��' => '蠐',
+  '��' => '蠑',
+  '��' => '蠗',
+  '��' => '蠓',
+  '��' => '蠖',
+  '��' => '襣',
+  '��' => '襦',
+  '��' => '覹',
+  '��' => '觷',
+  '��' => '譠',
+  '��' => '譪',
+  '��' => '譝',
+  '��' => '譨',
+  '��' => '譣',
+  '��' => '譥',
+  '��' => '譧',
+  '��' => '譭',
+  '��' => '趮',
+  '��' => '躆',
+  '��' => '躈',
+  '��' => '躄',
+  '��' => '轙',
+  '��' => '轖',
+  '��' => '轗',
+  '��' => '轕',
+  '��' => '轘',
+  '��' => '轚',
+  '��' => '邍',
+  '��' => '酃',
+  '��' => '酁',
+  '��' => '醷',
+  '��' => '醵',
+  '��' => '醲',
+  '��' => '醳',
+  '��' => '鐋',
+  '��' => '鐓',
+  '��' => '鏻',
+  '��' => '鐠',
+  '��' => '鐏',
+  '��' => '鐔',
+  '��' => '鏾',
+  '��' => '鐕',
+  '��' => '鐐',
+  '��' => '鐨',
+  '��' => '鐙',
+  '��' => '鐍',
+  '��' => '鏵',
+  '��' => '鐀',
+  '��' => '鏷',
+  '��' => '鐇',
+  '��' => '鐎',
+  '��' => '鐖',
+  '��' => '鐒',
+  '��' => '鏺',
+  '��' => '鐉',
+  '��' => '鏸',
+  '��' => '鐊',
+  '��' => '鏿',
+  '�@' => '鏼',
+  '�A' => '鐌',
+  '�B' => '鏶',
+  '�C' => '鐑',
+  '�D' => '鐆',
+  '�E' => '闞',
+  '�F' => '闠',
+  '�G' => '闟',
+  '�H' => '霮',
+  '�I' => '霯',
+  '�J' => '鞹',
+  '�K' => '鞻',
+  '�L' => '韽',
+  '�M' => '韾',
+  '�N' => '顠',
+  '�O' => '顢',
+  '�P' => '顣',
+  '�Q' => '顟',
+  '�R' => '飁',
+  '�S' => '飂',
+  '�T' => '饐',
+  '�U' => '饎',
+  '�V' => '饙',
+  '�W' => '饌',
+  '�X' => '饋',
+  '�Y' => '饓',
+  '�Z' => '騲',
+  '�[' => '騴',
+  '�\\' => '騱',
+  '�]' => '騬',
+  '�^' => '騪',
+  '�_' => '騶',
+  '�`' => '騩',
+  '�a' => '騮',
+  '�b' => '騸',
+  '�c' => '騭',
+  '�d' => '髇',
+  '�e' => '髊',
+  '�f' => '髆',
+  '�g' => '鬐',
+  '�h' => '鬒',
+  '�i' => '鬑',
+  '�j' => '鰋',
+  '�k' => '鰈',
+  '�l' => '鯷',
+  '�m' => '鰅',
+  '�n' => '鰒',
+  '�o' => '鯸',
+  '�p' => '鱀',
+  '�q' => '鰇',
+  '�r' => '鰎',
+  '�s' => '鰆',
+  '�t' => '鰗',
+  '�u' => '鰔',
+  '�v' => '鰉',
+  '�w' => '鶟',
+  '�x' => '鶙',
+  '�y' => '鶤',
+  '�z' => '鶝',
+  '�{' => '鶒',
+  '�|' => '鶘',
+  '�}' => '鶐',
+  '�~' => '鶛',
+  '��' => '鶠',
+  '��' => '鶔',
+  '��' => '鶜',
+  '��' => '鶪',
+  '��' => '鶗',
+  '��' => '鶡',
+  '��' => '鶚',
+  '��' => '鶢',
+  '��' => '鶨',
+  '��' => '鶞',
+  '��' => '鶣',
+  '��' => '鶿',
+  '��' => '鶩',
+  '��' => '鶖',
+  '��' => '鶦',
+  '��' => '鶧',
+  '��' => '麙',
+  '��' => '麛',
+  '��' => '麚',
+  '��' => '黥',
+  '��' => '黤',
+  '��' => '黧',
+  '��' => '黦',
+  '��' => '鼰',
+  '��' => '鼮',
+  '��' => '齛',
+  '��' => '齠',
+  '��' => '齞',
+  '��' => '齝',
+  '��' => '齙',
+  '��' => '龑',
+  '��' => '儺',
+  '��' => '儹',
+  '��' => '劘',
+  '��' => '劗',
+  '��' => '囃',
+  '��' => '嚽',
+  '��' => '嚾',
+  '��' => '孈',
+  '��' => '孇',
+  '��' => '巋',
+  '��' => '巏',
+  '��' => '廱',
+  '��' => '懽',
+  '��' => '攛',
+  '��' => '欂',
+  '��' => '櫼',
+  '��' => '欃',
+  '��' => '櫸',
+  '��' => '欀',
+  '��' => '灃',
+  '��' => '灄',
+  '��' => '灊',
+  '��' => '灈',
+  '��' => '灉',
+  '��' => '灅',
+  '��' => '灆',
+  '��' => '爝',
+  '��' => '爚',
+  '��' => '爙',
+  '��' => '獾',
+  '��' => '甗',
+  '��' => '癪',
+  '��' => '矐',
+  '��' => '礭',
+  '��' => '礱',
+  '��' => '礯',
+  '��' => '籔',
+  '��' => '籓',
+  '��' => '糲',
+  '��' => '纊',
+  '��' => '纇',
+  '��' => '纈',
+  '��' => '纋',
+  '��' => '纆',
+  '��' => '纍',
+  '��' => '罍',
+  '��' => '羻',
+  '��' => '耰',
+  '��' => '臝',
+  '��' => '蘘',
+  '��' => '蘪',
+  '��' => '蘦',
+  '��' => '蘟',
+  '��' => '蘣',
+  '��' => '蘜',
+  '��' => '蘙',
+  '��' => '蘧',
+  '��' => '蘮',
+  '��' => '蘡',
+  '��' => '蘠',
+  '��' => '蘩',
+  '��' => '蘞',
+  '��' => '蘥',
+  '�@' => '蠩',
+  '�A' => '蠝',
+  '�B' => '蠛',
+  '�C' => '蠠',
+  '�D' => '蠤',
+  '�E' => '蠜',
+  '�F' => '蠫',
+  '�G' => '衊',
+  '�H' => '襭',
+  '�I' => '襩',
+  '�J' => '襮',
+  '�K' => '襫',
+  '�L' => '觺',
+  '�M' => '譹',
+  '�N' => '譸',
+  '�O' => '譅',
+  '�P' => '譺',
+  '�Q' => '譻',
+  '�R' => '贐',
+  '�S' => '贔',
+  '�T' => '趯',
+  '�U' => '躎',
+  '�V' => '躌',
+  '�W' => '轞',
+  '�X' => '轛',
+  '�Y' => '轝',
+  '�Z' => '酆',
+  '�[' => '酄',
+  '�\\' => '酅',
+  '�]' => '醹',
+  '�^' => '鐿',
+  '�_' => '鐻',
+  '�`' => '鐶',
+  '�a' => '鐩',
+  '�b' => '鐽',
+  '�c' => '鐼',
+  '�d' => '鐰',
+  '�e' => '鐹',
+  '�f' => '鐪',
+  '�g' => '鐷',
+  '�h' => '鐬',
+  '�i' => '鑀',
+  '�j' => '鐱',
+  '�k' => '闥',
+  '�l' => '闤',
+  '�m' => '闣',
+  '�n' => '霵',
+  '�o' => '霺',
+  '�p' => '鞿',
+  '�q' => '韡',
+  '�r' => '顤',
+  '�s' => '飉',
+  '�t' => '飆',
+  '�u' => '飀',
+  '�v' => '饘',
+  '�w' => '饖',
+  '�x' => '騹',
+  '�y' => '騽',
+  '�z' => '驆',
+  '�{' => '驄',
+  '�|' => '驂',
+  '�}' => '驁',
+  '�~' => '騺',
+  '��' => '騿',
+  '��' => '髍',
+  '��' => '鬕',
+  '��' => '鬗',
+  '��' => '鬘',
+  '��' => '鬖',
+  '��' => '鬺',
+  '��' => '魒',
+  '��' => '鰫',
+  '��' => '鰝',
+  '��' => '鰜',
+  '��' => '鰬',
+  '��' => '鰣',
+  '��' => '鰨',
+  '��' => '鰩',
+  '��' => '鰤',
+  '��' => '鰡',
+  '��' => '鶷',
+  '��' => '鶶',
+  '��' => '鶼',
+  '��' => '鷁',
+  '��' => '鷇',
+  '��' => '鷊',
+  '��' => '鷏',
+  '��' => '鶾',
+  '��' => '鷅',
+  '��' => '鷃',
+  '��' => '鶻',
+  '��' => '鶵',
+  '��' => '鷎',
+  '��' => '鶹',
+  '��' => '鶺',
+  '��' => '鶬',
+  '��' => '鷈',
+  '��' => '鶱',
+  '��' => '鶭',
+  '��' => '鷌',
+  '��' => '鶳',
+  '��' => '鷍',
+  '��' => '鶲',
+  '��' => '鹺',
+  '��' => '麜',
+  '��' => '黫',
+  '��' => '黮',
+  '��' => '黭',
+  '��' => '鼛',
+  '��' => '鼘',
+  '��' => '鼚',
+  '��' => '鼱',
+  '��' => '齎',
+  '��' => '齥',
+  '��' => '齤',
+  '��' => '龒',
+  '��' => '亹',
+  '��' => '囆',
+  '��' => '囅',
+  '��' => '囋',
+  '��' => '奱',
+  '��' => '孋',
+  '��' => '孌',
+  '��' => '巕',
+  '��' => '巑',
+  '��' => '廲',
+  '��' => '攡',
+  '��' => '攠',
+  '��' => '攦',
+  '��' => '攢',
+  '��' => '欋',
+  '��' => '欈',
+  '��' => '欉',
+  '��' => '氍',
+  '��' => '灕',
+  '��' => '灖',
+  '��' => '灗',
+  '��' => '灒',
+  '��' => '爞',
+  '��' => '爟',
+  '��' => '犩',
+  '��' => '獿',
+  '��' => '瓘',
+  '��' => '瓕',
+  '��' => '瓙',
+  '��' => '瓗',
+  '��' => '癭',
+  '��' => '皭',
+  '��' => '礵',
+  '��' => '禴',
+  '��' => '穰',
+  '��' => '穱',
+  '��' => '籗',
+  '��' => '籜',
+  '��' => '籙',
+  '��' => '籛',
+  '��' => '籚',
+  '�@' => '糴',
+  '�A' => '糱',
+  '�B' => '纑',
+  '�C' => '罏',
+  '�D' => '羇',
+  '�E' => '臞',
+  '�F' => '艫',
+  '�G' => '蘴',
+  '�H' => '蘵',
+  '�I' => '蘳',
+  '�J' => '蘬',
+  '�K' => '蘲',
+  '�L' => '蘶',
+  '�M' => '蠬',
+  '�N' => '蠨',
+  '�O' => '蠦',
+  '�P' => '蠪',
+  '�Q' => '蠥',
+  '�R' => '襱',
+  '�S' => '覿',
+  '�T' => '覾',
+  '�U' => '觻',
+  '�V' => '譾',
+  '�W' => '讄',
+  '�X' => '讂',
+  '�Y' => '讆',
+  '�Z' => '讅',
+  '�[' => '譿',
+  '�\\' => '贕',
+  '�]' => '躕',
+  '�^' => '躔',
+  '�_' => '躚',
+  '�`' => '躒',
+  '�a' => '躐',
+  '�b' => '躖',
+  '�c' => '躗',
+  '�d' => '轠',
+  '�e' => '轢',
+  '�f' => '酇',
+  '�g' => '鑌',
+  '�h' => '鑐',
+  '�i' => '鑊',
+  '�j' => '鑋',
+  '�k' => '鑏',
+  '�l' => '鑇',
+  '�m' => '鑅',
+  '�n' => '鑈',
+  '�o' => '鑉',
+  '�p' => '鑆',
+  '�q' => '霿',
+  '�r' => '韣',
+  '�s' => '顪',
+  '�t' => '顩',
+  '�u' => '飋',
+  '�v' => '饔',
+  '�w' => '饛',
+  '�x' => '驎',
+  '�y' => '驓',
+  '�z' => '驔',
+  '�{' => '驌',
+  '�|' => '驏',
+  '�}' => '驈',
+  '�~' => '驊',
+  '��' => '驉',
+  '��' => '驒',
+  '��' => '驐',
+  '��' => '髐',
+  '��' => '鬙',
+  '��' => '鬫',
+  '��' => '鬻',
+  '��' => '魖',
+  '��' => '魕',
+  '��' => '鱆',
+  '��' => '鱈',
+  '��' => '鰿',
+  '��' => '鱄',
+  '��' => '鰹',
+  '��' => '鰳',
+  '��' => '鱁',
+  '��' => '鰼',
+  '��' => '鰷',
+  '��' => '鰴',
+  '��' => '鰲',
+  '��' => '鰽',
+  '��' => '鰶',
+  '��' => '鷛',
+  '��' => '鷒',
+  '��' => '鷞',
+  '��' => '鷚',
+  '��' => '鷋',
+  '��' => '鷐',
+  '��' => '鷜',
+  '��' => '鷑',
+  '��' => '鷟',
+  '��' => '鷩',
+  '��' => '鷙',
+  '��' => '鷘',
+  '��' => '鷖',
+  '��' => '鷵',
+  '��' => '鷕',
+  '��' => '鷝',
+  '��' => '麶',
+  '��' => '黰',
+  '��' => '鼵',
+  '��' => '鼳',
+  '��' => '鼲',
+  '��' => '齂',
+  '��' => '齫',
+  '��' => '龕',
+  '��' => '龢',
+  '��' => '儽',
+  '��' => '劙',
+  '��' => '壨',
+  '��' => '壧',
+  '��' => '奲',
+  '��' => '孍',
+  '��' => '巘',
+  '��' => '蠯',
+  '��' => '彏',
+  '��' => '戁',
+  '��' => '戃',
+  '��' => '戄',
+  '��' => '攩',
+  '��' => '攥',
+  '��' => '斖',
+  '��' => '曫',
+  '��' => '欑',
+  '��' => '欒',
+  '��' => '欏',
+  '��' => '毊',
+  '��' => '灛',
+  '��' => '灚',
+  '��' => '爢',
+  '��' => '玂',
+  '��' => '玁',
+  '��' => '玃',
+  '��' => '癰',
+  '��' => '矔',
+  '��' => '籧',
+  '��' => '籦',
+  '��' => '纕',
+  '��' => '艬',
+  '��' => '蘺',
+  '��' => '虀',
+  '��' => '蘹',
+  '��' => '蘼',
+  '��' => '蘱',
+  '��' => '蘻',
+  '��' => '蘾',
+  '��' => '蠰',
+  '��' => '蠲',
+  '��' => '蠮',
+  '��' => '蠳',
+  '��' => '襶',
+  '��' => '襴',
+  '��' => '襳',
+  '��' => '觾',
+  '�@' => '讌',
+  '�A' => '讎',
+  '�B' => '讋',
+  '�C' => '讈',
+  '�D' => '豅',
+  '�E' => '贙',
+  '�F' => '躘',
+  '�G' => '轤',
+  '�H' => '轣',
+  '�I' => '醼',
+  '�J' => '鑢',
+  '�K' => '鑕',
+  '�L' => '鑝',
+  '�M' => '鑗',
+  '�N' => '鑞',
+  '�O' => '韄',
+  '�P' => '韅',
+  '�Q' => '頀',
+  '�R' => '驖',
+  '�S' => '驙',
+  '�T' => '鬞',
+  '�U' => '鬟',
+  '�V' => '鬠',
+  '�W' => '鱒',
+  '�X' => '鱘',
+  '�Y' => '鱐',
+  '�Z' => '鱊',
+  '�[' => '鱍',
+  '�\\' => '鱋',
+  '�]' => '鱕',
+  '�^' => '鱙',
+  '�_' => '鱌',
+  '�`' => '鱎',
+  '�a' => '鷻',
+  '�b' => '鷷',
+  '�c' => '鷯',
+  '�d' => '鷣',
+  '�e' => '鷫',
+  '�f' => '鷸',
+  '�g' => '鷤',
+  '�h' => '鷶',
+  '�i' => '鷡',
+  '�j' => '鷮',
+  '�k' => '鷦',
+  '�l' => '鷲',
+  '�m' => '鷰',
+  '�n' => '鷢',
+  '�o' => '鷬',
+  '�p' => '鷴',
+  '�q' => '鷳',
+  '�r' => '鷨',
+  '�s' => '鷭',
+  '�t' => '黂',
+  '�u' => '黐',
+  '�v' => '黲',
+  '�w' => '黳',
+  '�x' => '鼆',
+  '�y' => '鼜',
+  '�z' => '鼸',
+  '�{' => '鼷',
+  '�|' => '鼶',
+  '�}' => '齃',
+  '�~' => '齏',
+  '��' => '齱',
+  '��' => '齰',
+  '��' => '齮',
+  '��' => '齯',
+  '��' => '囓',
+  '��' => '囍',
+  '��' => '孎',
+  '��' => '屭',
+  '��' => '攭',
+  '��' => '曭',
+  '��' => '曮',
+  '��' => '欓',
+  '��' => '灟',
+  '��' => '灡',
+  '��' => '灝',
+  '��' => '灠',
+  '��' => '爣',
+  '��' => '瓛',
+  '��' => '瓥',
+  '��' => '矕',
+  '��' => '礸',
+  '��' => '禷',
+  '��' => '禶',
+  '��' => '籪',
+  '��' => '纗',
+  '��' => '羉',
+  '��' => '艭',
+  '��' => '虃',
+  '��' => '蠸',
+  '��' => '蠷',
+  '��' => '蠵',
+  '��' => '衋',
+  '��' => '讔',
+  '��' => '讕',
+  '��' => '躞',
+  '��' => '躟',
+  '��' => '躠',
+  '��' => '躝',
+  '��' => '醾',
+  '��' => '醽',
+  '��' => '釂',
+  '��' => '鑫',
+  '��' => '鑨',
+  '��' => '鑩',
+  '��' => '雥',
+  '��' => '靆',
+  '��' => '靃',
+  '��' => '靇',
+  '��' => '韇',
+  '��' => '韥',
+  '��' => '驞',
+  '��' => '髕',
+  '��' => '魙',
+  '��' => '鱣',
+  '��' => '鱧',
+  '��' => '鱦',
+  '��' => '鱢',
+  '��' => '鱞',
+  '��' => '鱠',
+  '��' => '鸂',
+  '��' => '鷾',
+  '��' => '鸇',
+  '��' => '鸃',
+  '��' => '鸆',
+  '��' => '鸅',
+  '��' => '鸀',
+  '��' => '鸁',
+  '��' => '鸉',
+  '��' => '鷿',
+  '��' => '鷽',
+  '��' => '鸄',
+  '��' => '麠',
+  '��' => '鼞',
+  '��' => '齆',
+  '��' => '齴',
+  '��' => '齵',
+  '��' => '齶',
+  '��' => '囔',
+  '��' => '攮',
+  '��' => '斸',
+  '��' => '欘',
+  '��' => '欙',
+  '��' => '欗',
+  '��' => '欚',
+  '��' => '灢',
+  '��' => '爦',
+  '��' => '犪',
+  '��' => '矘',
+  '��' => '矙',
+  '��' => '礹',
+  '��' => '籩',
+  '��' => '籫',
+  '��' => '糶',
+  '��' => '纚',
+  '�@' => '纘',
+  '�A' => '纛',
+  '�B' => '纙',
+  '�C' => '臠',
+  '�D' => '臡',
+  '�E' => '虆',
+  '�F' => '虇',
+  '�G' => '虈',
+  '�H' => '襹',
+  '�I' => '襺',
+  '�J' => '襼',
+  '�K' => '襻',
+  '�L' => '觿',
+  '�M' => '讘',
+  '�N' => '讙',
+  '�O' => '躥',
+  '�P' => '躤',
+  '�Q' => '躣',
+  '�R' => '鑮',
+  '�S' => '鑭',
+  '�T' => '鑯',
+  '�U' => '鑱',
+  '�V' => '鑳',
+  '�W' => '靉',
+  '�X' => '顲',
+  '�Y' => '饟',
+  '�Z' => '鱨',
+  '�[' => '鱮',
+  '�\\' => '鱭',
+  '�]' => '鸋',
+  '�^' => '鸍',
+  '�_' => '鸐',
+  '�`' => '鸏',
+  '�a' => '鸒',
+  '�b' => '鸑',
+  '�c' => '麡',
+  '�d' => '黵',
+  '�e' => '鼉',
+  '�f' => '齇',
+  '�g' => '齸',
+  '�h' => '齻',
+  '�i' => '齺',
+  '�j' => '齹',
+  '�k' => '圞',
+  '�l' => '灦',
+  '�m' => '籯',
+  '�n' => '蠼',
+  '�o' => '趲',
+  '�p' => '躦',
+  '�q' => '釃',
+  '�r' => '鑴',
+  '�s' => '鑸',
+  '�t' => '鑶',
+  '�u' => '鑵',
+  '�v' => '驠',
+  '�w' => '鱴',
+  '�x' => '鱳',
+  '�y' => '鱱',
+  '�z' => '鱵',
+  '�{' => '鸔',
+  '�|' => '鸓',
+  '�}' => '黶',
+  '�~' => '鼊',
+  '��' => '龤',
+  '��' => '灨',
+  '��' => '灥',
+  '��' => '糷',
+  '��' => '虪',
+  '��' => '蠾',
+  '��' => '蠽',
+  '��' => '蠿',
+  '��' => '讞',
+  '��' => '貜',
+  '��' => '躩',
+  '��' => '軉',
+  '��' => '靋',
+  '��' => '顳',
+  '��' => '顴',
+  '��' => '飌',
+  '��' => '饡',
+  '��' => '馫',
+  '��' => '驤',
+  '��' => '驦',
+  '��' => '驧',
+  '��' => '鬤',
+  '��' => '鸕',
+  '��' => '鸗',
+  '��' => '齈',
+  '��' => '戇',
+  '��' => '欞',
+  '��' => '爧',
+  '��' => '虌',
+  '��' => '躨',
+  '��' => '钂',
+  '��' => '钀',
+  '��' => '钁',
+  '��' => '驩',
+  '��' => '驨',
+  '��' => '鬮',
+  '��' => '鸙',
+  '��' => '爩',
+  '��' => '虋',
+  '��' => '讟',
+  '��' => '钃',
+  '��' => '鱹',
+  '��' => '麷',
+  '��' => '癵',
+  '��' => '驫',
+  '��' => '鱺',
+  '��' => '鸝',
+  '��' => '灩',
+  '��' => '灪',
+  '��' => '麤',
+  '��' => '齾',
+  '��' => '齉',
+  '��' => '龘',
+);
+
+$result =& $data;
+unset($data);
+
+return $result;
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php
new file mode 100644
index 000000000..a014e4b45
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php
new file mode 100644
index 000000000..2b5e7beb9
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php
new file mode 100644
index 000000000..aba455b5e
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php
new file mode 100644
index 000000000..e8e237030
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php
new file mode 100644
index 000000000..e3ebb45c9
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php
new file mode 100644
index 000000000..3771c8f62
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php
new file mode 100644
index 000000000..2d67d33f9
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php
new file mode 100644
index 000000000..1fbc4cdc6
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php
new file mode 100644
index 000000000..0b314c80b
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php
new file mode 100644
index 000000000..f8c318cad
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php
new file mode 100644
index 000000000..48440ba1a
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php
new file mode 100644
index 000000000..c9cac0c35
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php
new file mode 100644
index 000000000..3e7770ad5
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php
new file mode 100644
index 000000000..2a52d4736
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php
new file mode 100644
index 000000000..4ba6573c3
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php
new file mode 100644
index 000000000..d2a29a228
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php
new file mode 100644
index 000000000..1f36b9a24
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php
new file mode 100644
index 000000000..953e46350
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php
new file mode 100644
index 000000000..2668bcc4e
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php
new file mode 100644
index 000000000..a7b47f8f3
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php
new file mode 100644
index 000000000..0f040548b
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php
new file mode 100644
index 000000000..479945691
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php
new file mode 100644
index 000000000..856164536
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php
new file mode 100644
index 000000000..0bf828ffd
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php
new file mode 100644
index 000000000..a593d05de
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php
new file mode 100644
index 000000000..d4e99f1f4
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php
new file mode 100644
index 000000000..267b19066
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php
new file mode 100644
index 000000000..d7a217c93
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php
new file mode 100644
index 000000000..d60f6473a
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php
new file mode 100644
index 000000000..d69220bff
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php
new file mode 100644
index 000000000..838783f1b
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php
new file mode 100644
index 000000000..65a48ee39
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php
new file mode 100644
index 000000000..42e50e0fd
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php
new file mode 100644
index 000000000..46758a6a7
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php
new file mode 100644
index 000000000..5f23f515c
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php
new file mode 100644
index 000000000..b31bb83f4
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php
new file mode 100644
index 000000000..9cbf9f37a
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php
new file mode 100644
index 000000000..fd0388230
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php
new file mode 100644
index 000000000..ed6f72f36
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php
new file mode 100644
index 000000000..cf723ac68
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php
new file mode 100644
index 000000000..c978731a4
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php
new file mode 100644
index 000000000..2a3e36a48
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php b/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php
new file mode 100644
index 000000000..d83c2125b
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php b/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php
new file mode 100644
index 000000000..dbbf96be1
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php b/lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php
new file mode 100644
index 000000000..94a93b280
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php
new file mode 100644
index 000000000..d1d5e6f25
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php
new file mode 100644
index 000000000..f422a71fc
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php
new file mode 100644
index 000000000..ba6d203dc
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php
new file mode 100644
index 000000000..c04dc8f0e
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php
new file mode 100644
index 000000000..1cfadcf2b
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php
new file mode 100644
index 000000000..f73cbb6ff
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php
new file mode 100644
index 000000000..953704f6e
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php
new file mode 100644
index 000000000..78580ece0
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php
new file mode 100644
index 000000000..de1609d85
Binary files /dev/null and b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php differ
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/translit.php b/lib/symfony/polyfill-iconv/Resources/charset/translit.php
new file mode 100644
index 000000000..779db649c
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/Resources/charset/translit.php
@@ -0,0 +1,4103 @@
+<?php
+
+return array (
+  'µ' => 'μ',
+  '¼' => ' 1⁄4 ',
+  '½' => ' 1⁄2 ',
+  '¾' => ' 3⁄4 ',
+  'IJ' => 'IJ',
+  'ij' => 'ij',
+  'Ŀ' => 'L·',
+  'ŀ' => 'l·',
+  'ʼn' => 'ʼn',
+  'ſ' => 's',
+  'DŽ' => 'DŽ',
+  'Dž' => 'Dž',
+  'dž' => 'dž',
+  'LJ' => 'LJ',
+  'Lj' => 'Lj',
+  'lj' => 'lj',
+  'NJ' => 'NJ',
+  'Nj' => 'Nj',
+  'nj' => 'nj',
+  'DZ' => 'DZ',
+  'Dz' => 'Dz',
+  'dz' => 'dz',
+  'ϐ' => 'β',
+  'ϑ' => 'θ',
+  'ϒ' => 'Υ',
+  'ϕ' => 'φ',
+  'ϖ' => 'π',
+  'ϰ' => 'κ',
+  'ϱ' => 'ρ',
+  'ϲ' => 'ς',
+  'ϴ' => 'Θ',
+  'ϵ' => 'ε',
+  'Ϲ' => 'Σ',
+  'և' => 'եւ',
+  'ٵ' => 'اٴ',
+  'ٶ' => 'وٴ',
+  'ٷ' => 'ۇٴ',
+  'ٸ' => 'يٴ',
+  'ำ' => 'ํา',
+  'ຳ' => 'ໍາ',
+  'ໜ' => 'ຫນ',
+  'ໝ' => 'ຫມ',
+  'ཷ' => 'ྲཱྀ',
+  'ཹ' => 'ླཱྀ',
+  'ẚ' => 'aʾ',
+  '․' => '.',
+  '‥' => '..',
+  '…' => '...',
+  '″' => '′′',
+  '‴' => '′′′',
+  '‶' => '‵‵',
+  '‷' => '‵‵‵',
+  '‼' => '!!',
+  '⁇' => '??',
+  '⁈' => '?!',
+  '⁉' => '!?',
+  '⁗' => '′′′′',
+  '₨' => 'Rs',
+  '℀' => 'a/c',
+  '℁' => 'a/s',
+  'ℂ' => 'C',
+  '℃' => '°C',
+  '℅' => 'c/o',
+  '℆' => 'c/u',
+  'ℇ' => 'Ɛ',
+  '℉' => '°F',
+  'ℊ' => 'g',
+  'ℋ' => 'H',
+  'ℌ' => 'H',
+  'ℍ' => 'H',
+  'ℎ' => 'h',
+  'ℏ' => 'ħ',
+  'ℐ' => 'I',
+  'ℑ' => 'I',
+  'ℒ' => 'L',
+  'ℓ' => 'l',
+  'ℕ' => 'N',
+  '№' => 'No',
+  'ℙ' => 'P',
+  'ℚ' => 'Q',
+  'ℛ' => 'R',
+  'ℜ' => 'R',
+  'ℝ' => 'R',
+  '℡' => 'TEL',
+  'ℤ' => 'Z',
+  'ℨ' => 'Z',
+  'ℬ' => 'B',
+  'ℭ' => 'C',
+  'ℯ' => 'e',
+  'ℰ' => 'E',
+  'ℱ' => 'F',
+  'ℳ' => 'M',
+  'ℴ' => 'o',
+  'ℵ' => 'א',
+  'ℶ' => 'ב',
+  'ℷ' => 'ג',
+  'ℸ' => 'ד',
+  'ℹ' => 'i',
+  '℻' => 'FAX',
+  'ℼ' => 'π',
+  'ℽ' => 'γ',
+  'ℾ' => 'Γ',
+  'ℿ' => 'Π',
+  '⅀' => '∑',
+  'ⅅ' => 'D',
+  'ⅆ' => 'd',
+  'ⅇ' => 'e',
+  'ⅈ' => 'i',
+  'ⅉ' => 'j',
+  '⅐' => ' 1⁄7 ',
+  '⅑' => ' 1⁄9 ',
+  '⅒' => ' 1⁄10 ',
+  '⅓' => ' 1⁄3 ',
+  '⅔' => ' 2⁄3 ',
+  '⅕' => ' 1⁄5 ',
+  '⅖' => ' 2⁄5 ',
+  '⅗' => ' 3⁄5 ',
+  '⅘' => ' 4⁄5 ',
+  '⅙' => ' 1⁄6 ',
+  '⅚' => ' 5⁄6 ',
+  '⅛' => ' 1⁄8 ',
+  '⅜' => ' 3⁄8 ',
+  '⅝' => ' 5⁄8 ',
+  '⅞' => ' 7⁄8 ',
+  '⅟' => ' 1⁄ ',
+  'Ⅰ' => 'I',
+  'Ⅱ' => 'II',
+  'Ⅲ' => 'III',
+  'Ⅳ' => 'IV',
+  'Ⅴ' => 'V',
+  'Ⅵ' => 'VI',
+  'Ⅶ' => 'VII',
+  'Ⅷ' => 'VIII',
+  'Ⅸ' => 'IX',
+  'Ⅹ' => 'X',
+  'Ⅺ' => 'XI',
+  'Ⅻ' => 'XII',
+  'Ⅼ' => 'L',
+  'Ⅽ' => 'C',
+  'Ⅾ' => 'D',
+  'Ⅿ' => 'M',
+  'ⅰ' => 'i',
+  'ⅱ' => 'ii',
+  'ⅲ' => 'iii',
+  'ⅳ' => 'iv',
+  'ⅴ' => 'v',
+  'ⅵ' => 'vi',
+  'ⅶ' => 'vii',
+  'ⅷ' => 'viii',
+  'ⅸ' => 'ix',
+  'ⅹ' => 'x',
+  'ⅺ' => 'xi',
+  'ⅻ' => 'xii',
+  'ⅼ' => 'l',
+  'ⅽ' => 'c',
+  'ⅾ' => 'd',
+  'ⅿ' => 'm',
+  '↉' => ' 0⁄3 ',
+  '∬' => '∫∫',
+  '∭' => '∫∫∫',
+  '∯' => '∮∮',
+  '∰' => '∮∮∮',
+  '①' => '(1)',
+  '②' => '(2)',
+  '③' => '(3)',
+  '④' => '(4)',
+  '⑤' => '(5)',
+  '⑥' => '(6)',
+  '⑦' => '(7)',
+  '⑧' => '(8)',
+  '⑨' => '(9)',
+  '⑩' => '(10)',
+  '⑪' => '(11)',
+  '⑫' => '(12)',
+  '⑬' => '(13)',
+  '⑭' => '(14)',
+  '⑮' => '(15)',
+  '⑯' => '(16)',
+  '⑰' => '(17)',
+  '⑱' => '(18)',
+  '⑲' => '(19)',
+  '⑳' => '(20)',
+  '⑴' => '(1)',
+  '⑵' => '(2)',
+  '⑶' => '(3)',
+  '⑷' => '(4)',
+  '⑸' => '(5)',
+  '⑹' => '(6)',
+  '⑺' => '(7)',
+  '⑻' => '(8)',
+  '⑼' => '(9)',
+  '⑽' => '(10)',
+  '⑾' => '(11)',
+  '⑿' => '(12)',
+  '⒀' => '(13)',
+  '⒁' => '(14)',
+  '⒂' => '(15)',
+  '⒃' => '(16)',
+  '⒄' => '(17)',
+  '⒅' => '(18)',
+  '⒆' => '(19)',
+  '⒇' => '(20)',
+  '⒈' => '1.',
+  '⒉' => '2.',
+  '⒊' => '3.',
+  '⒋' => '4.',
+  '⒌' => '5.',
+  '⒍' => '6.',
+  '⒎' => '7.',
+  '⒏' => '8.',
+  '⒐' => '9.',
+  '⒑' => '10.',
+  '⒒' => '11.',
+  '⒓' => '12.',
+  '⒔' => '13.',
+  '⒕' => '14.',
+  '⒖' => '15.',
+  '⒗' => '16.',
+  '⒘' => '17.',
+  '⒙' => '18.',
+  '⒚' => '19.',
+  '⒛' => '20.',
+  '⒜' => '(a)',
+  '⒝' => '(b)',
+  '⒞' => '(c)',
+  '⒟' => '(d)',
+  '⒠' => '(e)',
+  '⒡' => '(f)',
+  '⒢' => '(g)',
+  '⒣' => '(h)',
+  '⒤' => '(i)',
+  '⒥' => '(j)',
+  '⒦' => '(k)',
+  '⒧' => '(l)',
+  '⒨' => '(m)',
+  '⒩' => '(n)',
+  '⒪' => '(o)',
+  '⒫' => '(p)',
+  '⒬' => '(q)',
+  '⒭' => '(r)',
+  '⒮' => '(s)',
+  '⒯' => '(t)',
+  '⒰' => '(u)',
+  '⒱' => '(v)',
+  '⒲' => '(w)',
+  '⒳' => '(x)',
+  '⒴' => '(y)',
+  '⒵' => '(z)',
+  'Ⓐ' => '(A)',
+  'Ⓑ' => '(B)',
+  'Ⓒ' => '(C)',
+  'Ⓓ' => '(D)',
+  'Ⓔ' => '(E)',
+  'Ⓕ' => '(F)',
+  'Ⓖ' => '(G)',
+  'Ⓗ' => '(H)',
+  'Ⓘ' => '(I)',
+  'Ⓙ' => '(J)',
+  'Ⓚ' => '(K)',
+  'Ⓛ' => '(L)',
+  'Ⓜ' => '(M)',
+  'Ⓝ' => '(N)',
+  'Ⓞ' => '(O)',
+  'Ⓟ' => '(P)',
+  'Ⓠ' => '(Q)',
+  'Ⓡ' => '(R)',
+  'Ⓢ' => '(S)',
+  'Ⓣ' => '(T)',
+  'Ⓤ' => '(U)',
+  'Ⓥ' => '(V)',
+  'Ⓦ' => '(W)',
+  'Ⓧ' => '(X)',
+  'Ⓨ' => '(Y)',
+  'Ⓩ' => '(Z)',
+  'ⓐ' => '(a)',
+  'ⓑ' => '(b)',
+  'ⓒ' => '(c)',
+  'ⓓ' => '(d)',
+  'ⓔ' => '(e)',
+  'ⓕ' => '(f)',
+  'ⓖ' => '(g)',
+  'ⓗ' => '(h)',
+  'ⓘ' => '(i)',
+  'ⓙ' => '(j)',
+  'ⓚ' => '(k)',
+  'ⓛ' => '(l)',
+  'ⓜ' => '(m)',
+  'ⓝ' => '(n)',
+  'ⓞ' => '(o)',
+  'ⓟ' => '(p)',
+  'ⓠ' => '(q)',
+  'ⓡ' => '(r)',
+  'ⓢ' => '(s)',
+  'ⓣ' => '(t)',
+  'ⓤ' => '(u)',
+  'ⓥ' => '(v)',
+  'ⓦ' => '(w)',
+  'ⓧ' => '(x)',
+  'ⓨ' => '(y)',
+  'ⓩ' => '(z)',
+  '⓪' => '(0)',
+  '⨌' => '∫∫∫∫',
+  '⩴' => '::=',
+  '⩵' => '==',
+  '⩶' => '===',
+  '⺟' => '母',
+  '⻳' => '龟',
+  '⼀' => '一',
+  '⼁' => '丨',
+  '⼂' => '丶',
+  '⼃' => '丿',
+  '⼄' => '乙',
+  '⼅' => '亅',
+  '⼆' => '二',
+  '⼇' => '亠',
+  '⼈' => '人',
+  '⼉' => '儿',
+  '⼊' => '入',
+  '⼋' => '八',
+  '⼌' => '冂',
+  '⼍' => '冖',
+  '⼎' => '冫',
+  '⼏' => '几',
+  '⼐' => '凵',
+  '⼑' => '刀',
+  '⼒' => '力',
+  '⼓' => '勹',
+  '⼔' => '匕',
+  '⼕' => '匚',
+  '⼖' => '匸',
+  '⼗' => '十',
+  '⼘' => '卜',
+  '⼙' => '卩',
+  '⼚' => '厂',
+  '⼛' => '厶',
+  '⼜' => '又',
+  '⼝' => '口',
+  '⼞' => '囗',
+  '⼟' => '土',
+  '⼠' => '士',
+  '⼡' => '夂',
+  '⼢' => '夊',
+  '⼣' => '夕',
+  '⼤' => '大',
+  '⼥' => '女',
+  '⼦' => '子',
+  '⼧' => '宀',
+  '⼨' => '寸',
+  '⼩' => '小',
+  '⼪' => '尢',
+  '⼫' => '尸',
+  '⼬' => '屮',
+  '⼭' => '山',
+  '⼮' => '巛',
+  '⼯' => '工',
+  '⼰' => '己',
+  '⼱' => '巾',
+  '⼲' => '干',
+  '⼳' => '幺',
+  '⼴' => '广',
+  '⼵' => '廴',
+  '⼶' => '廾',
+  '⼷' => '弋',
+  '⼸' => '弓',
+  '⼹' => '彐',
+  '⼺' => '彡',
+  '⼻' => '彳',
+  '⼼' => '心',
+  '⼽' => '戈',
+  '⼾' => '戶',
+  '⼿' => '手',
+  '⽀' => '支',
+  '⽁' => '攴',
+  '⽂' => '文',
+  '⽃' => '斗',
+  '⽄' => '斤',
+  '⽅' => '方',
+  '⽆' => '无',
+  '⽇' => '日',
+  '⽈' => '曰',
+  '⽉' => '月',
+  '⽊' => '木',
+  '⽋' => '欠',
+  '⽌' => '止',
+  '⽍' => '歹',
+  '⽎' => '殳',
+  '⽏' => '毋',
+  '⽐' => '比',
+  '⽑' => '毛',
+  '⽒' => '氏',
+  '⽓' => '气',
+  '⽔' => '水',
+  '⽕' => '火',
+  '⽖' => '爪',
+  '⽗' => '父',
+  '⽘' => '爻',
+  '⽙' => '爿',
+  '⽚' => '片',
+  '⽛' => '牙',
+  '⽜' => '牛',
+  '⽝' => '犬',
+  '⽞' => '玄',
+  '⽟' => '玉',
+  '⽠' => '瓜',
+  '⽡' => '瓦',
+  '⽢' => '甘',
+  '⽣' => '生',
+  '⽤' => '用',
+  '⽥' => '田',
+  '⽦' => '疋',
+  '⽧' => '疒',
+  '⽨' => '癶',
+  '⽩' => '白',
+  '⽪' => '皮',
+  '⽫' => '皿',
+  '⽬' => '目',
+  '⽭' => '矛',
+  '⽮' => '矢',
+  '⽯' => '石',
+  '⽰' => '示',
+  '⽱' => '禸',
+  '⽲' => '禾',
+  '⽳' => '穴',
+  '⽴' => '立',
+  '⽵' => '竹',
+  '⽶' => '米',
+  '⽷' => '糸',
+  '⽸' => '缶',
+  '⽹' => '网',
+  '⽺' => '羊',
+  '⽻' => '羽',
+  '⽼' => '老',
+  '⽽' => '而',
+  '⽾' => '耒',
+  '⽿' => '耳',
+  '⾀' => '聿',
+  '⾁' => '肉',
+  '⾂' => '臣',
+  '⾃' => '自',
+  '⾄' => '至',
+  '⾅' => '臼',
+  '⾆' => '舌',
+  '⾇' => '舛',
+  '⾈' => '舟',
+  '⾉' => '艮',
+  '⾊' => '色',
+  '⾋' => '艸',
+  '⾌' => '虍',
+  '⾍' => '虫',
+  '⾎' => '血',
+  '⾏' => '行',
+  '⾐' => '衣',
+  '⾑' => '襾',
+  '⾒' => '見',
+  '⾓' => '角',
+  '⾔' => '言',
+  '⾕' => '谷',
+  '⾖' => '豆',
+  '⾗' => '豕',
+  '⾘' => '豸',
+  '⾙' => '貝',
+  '⾚' => '赤',
+  '⾛' => '走',
+  '⾜' => '足',
+  '⾝' => '身',
+  '⾞' => '車',
+  '⾟' => '辛',
+  '⾠' => '辰',
+  '⾡' => '辵',
+  '⾢' => '邑',
+  '⾣' => '酉',
+  '⾤' => '釆',
+  '⾥' => '里',
+  '⾦' => '金',
+  '⾧' => '長',
+  '⾨' => '門',
+  '⾩' => '阜',
+  '⾪' => '隶',
+  '⾫' => '隹',
+  '⾬' => '雨',
+  '⾭' => '靑',
+  '⾮' => '非',
+  '⾯' => '面',
+  '⾰' => '革',
+  '⾱' => '韋',
+  '⾲' => '韭',
+  '⾳' => '音',
+  '⾴' => '頁',
+  '⾵' => '風',
+  '⾶' => '飛',
+  '⾷' => '食',
+  '⾸' => '首',
+  '⾹' => '香',
+  '⾺' => '馬',
+  '⾻' => '骨',
+  '⾼' => '高',
+  '⾽' => '髟',
+  '⾾' => '鬥',
+  '⾿' => '鬯',
+  '⿀' => '鬲',
+  '⿁' => '鬼',
+  '⿂' => '魚',
+  '⿃' => '鳥',
+  '⿄' => '鹵',
+  '⿅' => '鹿',
+  '⿆' => '麥',
+  '⿇' => '麻',
+  '⿈' => '黃',
+  '⿉' => '黍',
+  '⿊' => '黑',
+  '⿋' => '黹',
+  '⿌' => '黽',
+  '⿍' => '鼎',
+  '⿎' => '鼓',
+  '⿏' => '鼠',
+  '⿐' => '鼻',
+  '⿑' => '齊',
+  '⿒' => '齒',
+  '⿓' => '龍',
+  '⿔' => '龜',
+  '⿕' => '龠',
+  '　' => ' ',
+  '〶' => '〒',
+  '〸' => '十',
+  '〹' => '卄',
+  '〺' => '卅',
+  'ㄱ' => 'ᄀ',
+  'ㄲ' => 'ᄁ',
+  'ㄳ' => 'ᆪ',
+  'ㄴ' => 'ᄂ',
+  'ㄵ' => 'ᆬ',
+  'ㄶ' => 'ᆭ',
+  'ㄷ' => 'ᄃ',
+  'ㄸ' => 'ᄄ',
+  'ㄹ' => 'ᄅ',
+  'ㄺ' => 'ᆰ',
+  'ㄻ' => 'ᆱ',
+  'ㄼ' => 'ᆲ',
+  'ㄽ' => 'ᆳ',
+  'ㄾ' => 'ᆴ',
+  'ㄿ' => 'ᆵ',
+  'ㅀ' => 'ᄚ',
+  'ㅁ' => 'ᄆ',
+  'ㅂ' => 'ᄇ',
+  'ㅃ' => 'ᄈ',
+  'ㅄ' => 'ᄡ',
+  'ㅅ' => 'ᄉ',
+  'ㅆ' => 'ᄊ',
+  'ㅇ' => 'ᄋ',
+  'ㅈ' => 'ᄌ',
+  'ㅉ' => 'ᄍ',
+  'ㅊ' => 'ᄎ',
+  'ㅋ' => 'ᄏ',
+  'ㅌ' => 'ᄐ',
+  'ㅍ' => 'ᄑ',
+  'ㅎ' => 'ᄒ',
+  'ㅏ' => 'ᅡ',
+  'ㅐ' => 'ᅢ',
+  'ㅑ' => 'ᅣ',
+  'ㅒ' => 'ᅤ',
+  'ㅓ' => 'ᅥ',
+  'ㅔ' => 'ᅦ',
+  'ㅕ' => 'ᅧ',
+  'ㅖ' => 'ᅨ',
+  'ㅗ' => 'ᅩ',
+  'ㅘ' => 'ᅪ',
+  'ㅙ' => 'ᅫ',
+  'ㅚ' => 'ᅬ',
+  'ㅛ' => 'ᅭ',
+  'ㅜ' => 'ᅮ',
+  'ㅝ' => 'ᅯ',
+  'ㅞ' => 'ᅰ',
+  'ㅟ' => 'ᅱ',
+  'ㅠ' => 'ᅲ',
+  'ㅡ' => 'ᅳ',
+  'ㅢ' => 'ᅴ',
+  'ㅣ' => 'ᅵ',
+  'ㅤ' => 'ᅠ',
+  'ㅥ' => 'ᄔ',
+  'ㅦ' => 'ᄕ',
+  'ㅧ' => 'ᇇ',
+  'ㅨ' => 'ᇈ',
+  'ㅩ' => 'ᇌ',
+  'ㅪ' => 'ᇎ',
+  'ㅫ' => 'ᇓ',
+  'ㅬ' => 'ᇗ',
+  'ㅭ' => 'ᇙ',
+  'ㅮ' => 'ᄜ',
+  'ㅯ' => 'ᇝ',
+  'ㅰ' => 'ᇟ',
+  'ㅱ' => 'ᄝ',
+  'ㅲ' => 'ᄞ',
+  'ㅳ' => 'ᄠ',
+  'ㅴ' => 'ᄢ',
+  'ㅵ' => 'ᄣ',
+  'ㅶ' => 'ᄧ',
+  'ㅷ' => 'ᄩ',
+  'ㅸ' => 'ᄫ',
+  'ㅹ' => 'ᄬ',
+  'ㅺ' => 'ᄭ',
+  'ㅻ' => 'ᄮ',
+  'ㅼ' => 'ᄯ',
+  'ㅽ' => 'ᄲ',
+  'ㅾ' => 'ᄶ',
+  'ㅿ' => 'ᅀ',
+  'ㆀ' => 'ᅇ',
+  'ㆁ' => 'ᅌ',
+  'ㆂ' => 'ᇱ',
+  'ㆃ' => 'ᇲ',
+  'ㆄ' => 'ᅗ',
+  'ㆅ' => 'ᅘ',
+  'ㆆ' => 'ᅙ',
+  'ㆇ' => 'ᆄ',
+  'ㆈ' => 'ᆅ',
+  'ㆉ' => 'ᆈ',
+  'ㆊ' => 'ᆑ',
+  'ㆋ' => 'ᆒ',
+  'ㆌ' => 'ᆔ',
+  'ㆍ' => 'ᆞ',
+  'ㆎ' => 'ᆡ',
+  '㈀' => '(ᄀ)',
+  '㈁' => '(ᄂ)',
+  '㈂' => '(ᄃ)',
+  '㈃' => '(ᄅ)',
+  '㈄' => '(ᄆ)',
+  '㈅' => '(ᄇ)',
+  '㈆' => '(ᄉ)',
+  '㈇' => '(ᄋ)',
+  '㈈' => '(ᄌ)',
+  '㈉' => '(ᄎ)',
+  '㈊' => '(ᄏ)',
+  '㈋' => '(ᄐ)',
+  '㈌' => '(ᄑ)',
+  '㈍' => '(ᄒ)',
+  '㈎' => '(가)',
+  '㈏' => '(나)',
+  '㈐' => '(다)',
+  '㈑' => '(라)',
+  '㈒' => '(마)',
+  '㈓' => '(바)',
+  '㈔' => '(사)',
+  '㈕' => '(아)',
+  '㈖' => '(자)',
+  '㈗' => '(차)',
+  '㈘' => '(카)',
+  '㈙' => '(타)',
+  '㈚' => '(파)',
+  '㈛' => '(하)',
+  '㈜' => '(주)',
+  '㈝' => '(오전)',
+  '㈞' => '(오후)',
+  '㈠' => '(一)',
+  '㈡' => '(二)',
+  '㈢' => '(三)',
+  '㈣' => '(四)',
+  '㈤' => '(五)',
+  '㈥' => '(六)',
+  '㈦' => '(七)',
+  '㈧' => '(八)',
+  '㈨' => '(九)',
+  '㈩' => '(十)',
+  '㈪' => '(月)',
+  '㈫' => '(火)',
+  '㈬' => '(水)',
+  '㈭' => '(木)',
+  '㈮' => '(金)',
+  '㈯' => '(土)',
+  '㈰' => '(日)',
+  '㈱' => '(株)',
+  '㈲' => '(有)',
+  '㈳' => '(社)',
+  '㈴' => '(名)',
+  '㈵' => '(特)',
+  '㈶' => '(財)',
+  '㈷' => '(祝)',
+  '㈸' => '(労)',
+  '㈹' => '(代)',
+  '㈺' => '(呼)',
+  '㈻' => '(学)',
+  '㈼' => '(監)',
+  '㈽' => '(企)',
+  '㈾' => '(資)',
+  '㈿' => '(協)',
+  '㉀' => '(祭)',
+  '㉁' => '(休)',
+  '㉂' => '(自)',
+  '㉃' => '(至)',
+  '㉄' => '(問)',
+  '㉅' => '(幼)',
+  '㉆' => '(文)',
+  '㉇' => '(箏)',
+  '㉐' => 'PTE',
+  '㉑' => '(21)',
+  '㉒' => '(22)',
+  '㉓' => '(23)',
+  '㉔' => '(24)',
+  '㉕' => '(25)',
+  '㉖' => '(26)',
+  '㉗' => '(27)',
+  '㉘' => '(28)',
+  '㉙' => '(29)',
+  '㉚' => '(30)',
+  '㉛' => '(31)',
+  '㉜' => '(32)',
+  '㉝' => '(33)',
+  '㉞' => '(34)',
+  '㉟' => '(35)',
+  '㉠' => '(ᄀ)',
+  '㉡' => '(ᄂ)',
+  '㉢' => '(ᄃ)',
+  '㉣' => '(ᄅ)',
+  '㉤' => '(ᄆ)',
+  '㉥' => '(ᄇ)',
+  '㉦' => '(ᄉ)',
+  '㉧' => '(ᄋ)',
+  '㉨' => '(ᄌ)',
+  '㉩' => '(ᄎ)',
+  '㉪' => '(ᄏ)',
+  '㉫' => '(ᄐ)',
+  '㉬' => '(ᄑ)',
+  '㉭' => '(ᄒ)',
+  '㉮' => '(가)',
+  '㉯' => '(나)',
+  '㉰' => '(다)',
+  '㉱' => '(라)',
+  '㉲' => '(마)',
+  '㉳' => '(바)',
+  '㉴' => '(사)',
+  '㉵' => '(아)',
+  '㉶' => '(자)',
+  '㉷' => '(차)',
+  '㉸' => '(카)',
+  '㉹' => '(타)',
+  '㉺' => '(파)',
+  '㉻' => '(하)',
+  '㉼' => '(참고)',
+  '㉽' => '(주의)',
+  '㉾' => '(우)',
+  '㊀' => '(一)',
+  '㊁' => '(二)',
+  '㊂' => '(三)',
+  '㊃' => '(四)',
+  '㊄' => '(五)',
+  '㊅' => '(六)',
+  '㊆' => '(七)',
+  '㊇' => '(八)',
+  '㊈' => '(九)',
+  '㊉' => '(十)',
+  '㊊' => '(月)',
+  '㊋' => '(火)',
+  '㊌' => '(水)',
+  '㊍' => '(木)',
+  '㊎' => '(金)',
+  '㊏' => '(土)',
+  '㊐' => '(日)',
+  '㊑' => '(株)',
+  '㊒' => '(有)',
+  '㊓' => '(社)',
+  '㊔' => '(名)',
+  '㊕' => '(特)',
+  '㊖' => '(財)',
+  '㊗' => '(祝)',
+  '㊘' => '(労)',
+  '㊙' => '(秘)',
+  '㊚' => '(男)',
+  '㊛' => '(女)',
+  '㊜' => '(適)',
+  '㊝' => '(優)',
+  '㊞' => '(印)',
+  '㊟' => '(注)',
+  '㊠' => '(項)',
+  '㊡' => '(休)',
+  '㊢' => '(写)',
+  '㊣' => '(正)',
+  '㊤' => '(上)',
+  '㊥' => '(中)',
+  '㊦' => '(下)',
+  '㊧' => '(左)',
+  '㊨' => '(右)',
+  '㊩' => '(医)',
+  '㊪' => '(宗)',
+  '㊫' => '(学)',
+  '㊬' => '(監)',
+  '㊭' => '(企)',
+  '㊮' => '(資)',
+  '㊯' => '(協)',
+  '㊰' => '(夜)',
+  '㊱' => '(36)',
+  '㊲' => '(37)',
+  '㊳' => '(38)',
+  '㊴' => '(39)',
+  '㊵' => '(40)',
+  '㊶' => '(41)',
+  '㊷' => '(42)',
+  '㊸' => '(43)',
+  '㊹' => '(44)',
+  '㊺' => '(45)',
+  '㊻' => '(46)',
+  '㊼' => '(47)',
+  '㊽' => '(48)',
+  '㊾' => '(49)',
+  '㊿' => '(50)',
+  '㋀' => '1月',
+  '㋁' => '2月',
+  '㋂' => '3月',
+  '㋃' => '4月',
+  '㋄' => '5月',
+  '㋅' => '6月',
+  '㋆' => '7月',
+  '㋇' => '8月',
+  '㋈' => '9月',
+  '㋉' => '10月',
+  '㋊' => '11月',
+  '㋋' => '12月',
+  '㋌' => 'Hg',
+  '㋍' => 'erg',
+  '㋎' => 'eV',
+  '㋏' => 'LTD',
+  '㋐' => '(ア)',
+  '㋑' => '(イ)',
+  '㋒' => '(ウ)',
+  '㋓' => '(エ)',
+  '㋔' => '(オ)',
+  '㋕' => '(カ)',
+  '㋖' => '(キ)',
+  '㋗' => '(ク)',
+  '㋘' => '(ケ)',
+  '㋙' => '(コ)',
+  '㋚' => '(サ)',
+  '㋛' => '(シ)',
+  '㋜' => '(ス)',
+  '㋝' => '(セ)',
+  '㋞' => '(ソ)',
+  '㋟' => '(タ)',
+  '㋠' => '(チ)',
+  '㋡' => '(ツ)',
+  '㋢' => '(テ)',
+  '㋣' => '(ト)',
+  '㋤' => '(ナ)',
+  '㋥' => '(ニ)',
+  '㋦' => '(ヌ)',
+  '㋧' => '(ネ)',
+  '㋨' => '(ノ)',
+  '㋩' => '(ハ)',
+  '㋪' => '(ヒ)',
+  '㋫' => '(フ)',
+  '㋬' => '(ヘ)',
+  '㋭' => '(ホ)',
+  '㋮' => '(マ)',
+  '㋯' => '(ミ)',
+  '㋰' => '(ム)',
+  '㋱' => '(メ)',
+  '㋲' => '(モ)',
+  '㋳' => '(ヤ)',
+  '㋴' => '(ユ)',
+  '㋵' => '(ヨ)',
+  '㋶' => '(ラ)',
+  '㋷' => '(リ)',
+  '㋸' => '(ル)',
+  '㋹' => '(レ)',
+  '㋺' => '(ロ)',
+  '㋻' => '(ワ)',
+  '㋼' => '(ヰ)',
+  '㋽' => '(ヱ)',
+  '㋾' => '(ヲ)',
+  '㋿' => '令和',
+  '㌀' => 'アパート',
+  '㌁' => 'アルファ',
+  '㌂' => 'アンペア',
+  '㌃' => 'アール',
+  '㌄' => 'イニング',
+  '㌅' => 'インチ',
+  '㌆' => 'ウォン',
+  '㌇' => 'エスクード',
+  '㌈' => 'エーカー',
+  '㌉' => 'オンス',
+  '㌊' => 'オーム',
+  '㌋' => 'カイリ',
+  '㌌' => 'カラット',
+  '㌍' => 'カロリー',
+  '㌎' => 'ガロン',
+  '㌏' => 'ガンマ',
+  '㌐' => 'ギガ',
+  '㌑' => 'ギニー',
+  '㌒' => 'キュリー',
+  '㌓' => 'ギルダー',
+  '㌔' => 'キロ',
+  '㌕' => 'キログラム',
+  '㌖' => 'キロメートル',
+  '㌗' => 'キロワット',
+  '㌘' => 'グラム',
+  '㌙' => 'グラムトン',
+  '㌚' => 'クルゼイロ',
+  '㌛' => 'クローネ',
+  '㌜' => 'ケース',
+  '㌝' => 'コルナ',
+  '㌞' => 'コーポ',
+  '㌟' => 'サイクル',
+  '㌠' => 'サンチーム',
+  '㌡' => 'シリング',
+  '㌢' => 'センチ',
+  '㌣' => 'セント',
+  '㌤' => 'ダース',
+  '㌥' => 'デシ',
+  '㌦' => 'ドル',
+  '㌧' => 'トン',
+  '㌨' => 'ナノ',
+  '㌩' => 'ノット',
+  '㌪' => 'ハイツ',
+  '㌫' => 'パーセント',
+  '㌬' => 'パーツ',
+  '㌭' => 'バーレル',
+  '㌮' => 'ピアストル',
+  '㌯' => 'ピクル',
+  '㌰' => 'ピコ',
+  '㌱' => 'ビル',
+  '㌲' => 'ファラッド',
+  '㌳' => 'フィート',
+  '㌴' => 'ブッシェル',
+  '㌵' => 'フラン',
+  '㌶' => 'ヘクタール',
+  '㌷' => 'ペソ',
+  '㌸' => 'ペニヒ',
+  '㌹' => 'ヘルツ',
+  '㌺' => 'ペンス',
+  '㌻' => 'ページ',
+  '㌼' => 'ベータ',
+  '㌽' => 'ポイント',
+  '㌾' => 'ボルト',
+  '㌿' => 'ホン',
+  '㍀' => 'ポンド',
+  '㍁' => 'ホール',
+  '㍂' => 'ホーン',
+  '㍃' => 'マイクロ',
+  '㍄' => 'マイル',
+  '㍅' => 'マッハ',
+  '㍆' => 'マルク',
+  '㍇' => 'マンション',
+  '㍈' => 'ミクロン',
+  '㍉' => 'ミリ',
+  '㍊' => 'ミリバール',
+  '㍋' => 'メガ',
+  '㍌' => 'メガトン',
+  '㍍' => 'メートル',
+  '㍎' => 'ヤード',
+  '㍏' => 'ヤール',
+  '㍐' => 'ユアン',
+  '㍑' => 'リットル',
+  '㍒' => 'リラ',
+  '㍓' => 'ルピー',
+  '㍔' => 'ルーブル',
+  '㍕' => 'レム',
+  '㍖' => 'レントゲン',
+  '㍗' => 'ワット',
+  '㍘' => '0点',
+  '㍙' => '1点',
+  '㍚' => '2点',
+  '㍛' => '3点',
+  '㍜' => '4点',
+  '㍝' => '5点',
+  '㍞' => '6点',
+  '㍟' => '7点',
+  '㍠' => '8点',
+  '㍡' => '9点',
+  '㍢' => '10点',
+  '㍣' => '11点',
+  '㍤' => '12点',
+  '㍥' => '13点',
+  '㍦' => '14点',
+  '㍧' => '15点',
+  '㍨' => '16点',
+  '㍩' => '17点',
+  '㍪' => '18点',
+  '㍫' => '19点',
+  '㍬' => '20点',
+  '㍭' => '21点',
+  '㍮' => '22点',
+  '㍯' => '23点',
+  '㍰' => '24点',
+  '㍱' => 'hPa',
+  '㍲' => 'da',
+  '㍳' => 'AU',
+  '㍴' => 'bar',
+  '㍵' => 'oV',
+  '㍶' => 'pc',
+  '㍷' => 'dm',
+  '㍸' => 'dm²',
+  '㍹' => 'dm³',
+  '㍺' => 'IU',
+  '㍻' => '平成',
+  '㍼' => '昭和',
+  '㍽' => '大正',
+  '㍾' => '明治',
+  '㍿' => '株式会社',
+  '㎀' => 'pA',
+  '㎁' => 'nA',
+  '㎂' => 'μA',
+  '㎃' => 'mA',
+  '㎄' => 'kA',
+  '㎅' => 'KB',
+  '㎆' => 'MB',
+  '㎇' => 'GB',
+  '㎈' => 'cal',
+  '㎉' => 'kcal',
+  '㎊' => 'pF',
+  '㎋' => 'nF',
+  '㎌' => 'μF',
+  '㎍' => 'μg',
+  '㎎' => 'mg',
+  '㎏' => 'kg',
+  '㎐' => 'Hz',
+  '㎑' => 'kHz',
+  '㎒' => 'MHz',
+  '㎓' => 'GHz',
+  '㎔' => 'THz',
+  '㎕' => 'μℓ',
+  '㎖' => 'mℓ',
+  '㎗' => 'dℓ',
+  '㎘' => 'kℓ',
+  '㎙' => 'fm',
+  '㎚' => 'nm',
+  '㎛' => 'μm',
+  '㎜' => 'mm',
+  '㎝' => 'cm',
+  '㎞' => 'km',
+  '㎟' => 'mm²',
+  '㎠' => 'cm²',
+  '㎡' => 'm²',
+  '㎢' => 'km²',
+  '㎣' => 'mm³',
+  '㎤' => 'cm³',
+  '㎥' => 'm³',
+  '㎦' => 'km³',
+  '㎧' => 'm∕s',
+  '㎨' => 'm∕s²',
+  '㎩' => 'Pa',
+  '㎪' => 'kPa',
+  '㎫' => 'MPa',
+  '㎬' => 'GPa',
+  '㎭' => 'rad',
+  '㎮' => 'rad∕s',
+  '㎯' => 'rad∕s²',
+  '㎰' => 'ps',
+  '㎱' => 'ns',
+  '㎲' => 'μs',
+  '㎳' => 'ms',
+  '㎴' => 'pV',
+  '㎵' => 'nV',
+  '㎶' => 'μV',
+  '㎷' => 'mV',
+  '㎸' => 'kV',
+  '㎹' => 'MV',
+  '㎺' => 'pW',
+  '㎻' => 'nW',
+  '㎼' => 'μW',
+  '㎽' => 'mW',
+  '㎾' => 'kW',
+  '㎿' => 'MW',
+  '㏀' => 'kΩ',
+  '㏁' => 'MΩ',
+  '㏂' => 'a.m.',
+  '㏃' => 'Bq',
+  '㏄' => 'cc',
+  '㏅' => 'cd',
+  '㏆' => 'C∕kg',
+  '㏇' => 'Co.',
+  '㏈' => 'dB',
+  '㏉' => 'Gy',
+  '㏊' => 'ha',
+  '㏋' => 'HP',
+  '㏌' => 'in',
+  '㏍' => 'KK',
+  '㏎' => 'KM',
+  '㏏' => 'kt',
+  '㏐' => 'lm',
+  '㏑' => 'ln',
+  '㏒' => 'log',
+  '㏓' => 'lx',
+  '㏔' => 'mb',
+  '㏕' => 'mil',
+  '㏖' => 'mol',
+  '㏗' => 'PH',
+  '㏘' => 'p.m.',
+  '㏙' => 'PPM',
+  '㏚' => 'PR',
+  '㏛' => 'sr',
+  '㏜' => 'Sv',
+  '㏝' => 'Wb',
+  '㏞' => 'V∕m',
+  '㏟' => 'A∕m',
+  '㏠' => '1日',
+  '㏡' => '2日',
+  '㏢' => '3日',
+  '㏣' => '4日',
+  '㏤' => '5日',
+  '㏥' => '6日',
+  '㏦' => '7日',
+  '㏧' => '8日',
+  '㏨' => '9日',
+  '㏩' => '10日',
+  '㏪' => '11日',
+  '㏫' => '12日',
+  '㏬' => '13日',
+  '㏭' => '14日',
+  '㏮' => '15日',
+  '㏯' => '16日',
+  '㏰' => '17日',
+  '㏱' => '18日',
+  '㏲' => '19日',
+  '㏳' => '20日',
+  '㏴' => '21日',
+  '㏵' => '22日',
+  '㏶' => '23日',
+  '㏷' => '24日',
+  '㏸' => '25日',
+  '㏹' => '26日',
+  '㏺' => '27日',
+  '㏻' => '28日',
+  '㏼' => '29日',
+  '㏽' => '30日',
+  '㏾' => '31日',
+  '㏿' => 'gal',
+  '豈' => '豈',
+  '更' => '更',
+  '車' => '車',
+  '賈' => '賈',
+  '滑' => '滑',
+  '串' => '串',
+  '句' => '句',
+  '龜' => '龜',
+  '龜' => '龜',
+  '契' => '契',
+  '金' => '金',
+  '喇' => '喇',
+  '奈' => '奈',
+  '懶' => '懶',
+  '癩' => '癩',
+  '羅' => '羅',
+  '蘿' => '蘿',
+  '螺' => '螺',
+  '裸' => '裸',
+  '邏' => '邏',
+  '樂' => '樂',
+  '洛' => '洛',
+  '烙' => '烙',
+  '珞' => '珞',
+  '落' => '落',
+  '酪' => '酪',
+  '駱' => '駱',
+  '亂' => '亂',
+  '卵' => '卵',
+  '欄' => '欄',
+  '爛' => '爛',
+  '蘭' => '蘭',
+  '鸞' => '鸞',
+  '嵐' => '嵐',
+  '濫' => '濫',
+  '藍' => '藍',
+  '襤' => '襤',
+  '拉' => '拉',
+  '臘' => '臘',
+  '蠟' => '蠟',
+  '廊' => '廊',
+  '朗' => '朗',
+  '浪' => '浪',
+  '狼' => '狼',
+  '郎' => '郎',
+  '來' => '來',
+  '冷' => '冷',
+  '勞' => '勞',
+  '擄' => '擄',
+  '櫓' => '櫓',
+  '爐' => '爐',
+  '盧' => '盧',
+  '老' => '老',
+  '蘆' => '蘆',
+  '虜' => '虜',
+  '路' => '路',
+  '露' => '露',
+  '魯' => '魯',
+  '鷺' => '鷺',
+  '碌' => '碌',
+  '祿' => '祿',
+  '綠' => '綠',
+  '菉' => '菉',
+  '錄' => '錄',
+  '鹿' => '鹿',
+  '論' => '論',
+  '壟' => '壟',
+  '弄' => '弄',
+  '籠' => '籠',
+  '聾' => '聾',
+  '牢' => '牢',
+  '磊' => '磊',
+  '賂' => '賂',
+  '雷' => '雷',
+  '壘' => '壘',
+  '屢' => '屢',
+  '樓' => '樓',
+  '淚' => '淚',
+  '漏' => '漏',
+  '累' => '累',
+  '縷' => '縷',
+  '陋' => '陋',
+  '勒' => '勒',
+  '肋' => '肋',
+  '凜' => '凜',
+  '凌' => '凌',
+  '稜' => '稜',
+  '綾' => '綾',
+  '菱' => '菱',
+  '陵' => '陵',
+  '讀' => '讀',
+  '拏' => '拏',
+  '樂' => '樂',
+  '諾' => '諾',
+  '丹' => '丹',
+  '寧' => '寧',
+  '怒' => '怒',
+  '率' => '率',
+  '異' => '異',
+  '北' => '北',
+  '磻' => '磻',
+  '便' => '便',
+  '復' => '復',
+  '不' => '不',
+  '泌' => '泌',
+  '數' => '數',
+  '索' => '索',
+  '參' => '參',
+  '塞' => '塞',
+  '省' => '省',
+  '葉' => '葉',
+  '說' => '說',
+  '殺' => '殺',
+  '辰' => '辰',
+  '沈' => '沈',
+  '拾' => '拾',
+  '若' => '若',
+  '掠' => '掠',
+  '略' => '略',
+  '亮' => '亮',
+  '兩' => '兩',
+  '凉' => '凉',
+  '梁' => '梁',
+  '糧' => '糧',
+  '良' => '良',
+  '諒' => '諒',
+  '量' => '量',
+  '勵' => '勵',
+  '呂' => '呂',
+  '女' => '女',
+  '廬' => '廬',
+  '旅' => '旅',
+  '濾' => '濾',
+  '礪' => '礪',
+  '閭' => '閭',
+  '驪' => '驪',
+  '麗' => '麗',
+  '黎' => '黎',
+  '力' => '力',
+  '曆' => '曆',
+  '歷' => '歷',
+  '轢' => '轢',
+  '年' => '年',
+  '憐' => '憐',
+  '戀' => '戀',
+  '撚' => '撚',
+  '漣' => '漣',
+  '煉' => '煉',
+  '璉' => '璉',
+  '秊' => '秊',
+  '練' => '練',
+  '聯' => '聯',
+  '輦' => '輦',
+  '蓮' => '蓮',
+  '連' => '連',
+  '鍊' => '鍊',
+  '列' => '列',
+  '劣' => '劣',
+  '咽' => '咽',
+  '烈' => '烈',
+  '裂' => '裂',
+  '說' => '說',
+  '廉' => '廉',
+  '念' => '念',
+  '捻' => '捻',
+  '殮' => '殮',
+  '簾' => '簾',
+  '獵' => '獵',
+  '令' => '令',
+  '囹' => '囹',
+  '寧' => '寧',
+  '嶺' => '嶺',
+  '怜' => '怜',
+  '玲' => '玲',
+  '瑩' => '瑩',
+  '羚' => '羚',
+  '聆' => '聆',
+  '鈴' => '鈴',
+  '零' => '零',
+  '靈' => '靈',
+  '領' => '領',
+  '例' => '例',
+  '禮' => '禮',
+  '醴' => '醴',
+  '隸' => '隸',
+  '惡' => '惡',
+  '了' => '了',
+  '僚' => '僚',
+  '寮' => '寮',
+  '尿' => '尿',
+  '料' => '料',
+  '樂' => '樂',
+  '燎' => '燎',
+  '療' => '療',
+  '蓼' => '蓼',
+  '遼' => '遼',
+  '龍' => '龍',
+  '暈' => '暈',
+  '阮' => '阮',
+  '劉' => '劉',
+  '杻' => '杻',
+  '柳' => '柳',
+  '流' => '流',
+  '溜' => '溜',
+  '琉' => '琉',
+  '留' => '留',
+  '硫' => '硫',
+  '紐' => '紐',
+  '類' => '類',
+  '六' => '六',
+  '戮' => '戮',
+  '陸' => '陸',
+  '倫' => '倫',
+  '崙' => '崙',
+  '淪' => '淪',
+  '輪' => '輪',
+  '律' => '律',
+  '慄' => '慄',
+  '栗' => '栗',
+  '率' => '率',
+  '隆' => '隆',
+  '利' => '利',
+  '吏' => '吏',
+  '履' => '履',
+  '易' => '易',
+  '李' => '李',
+  '梨' => '梨',
+  '泥' => '泥',
+  '理' => '理',
+  '痢' => '痢',
+  '罹' => '罹',
+  '裏' => '裏',
+  '裡' => '裡',
+  '里' => '里',
+  '離' => '離',
+  '匿' => '匿',
+  '溺' => '溺',
+  '吝' => '吝',
+  '燐' => '燐',
+  '璘' => '璘',
+  '藺' => '藺',
+  '隣' => '隣',
+  '鱗' => '鱗',
+  '麟' => '麟',
+  '林' => '林',
+  '淋' => '淋',
+  '臨' => '臨',
+  '立' => '立',
+  '笠' => '笠',
+  '粒' => '粒',
+  '狀' => '狀',
+  '炙' => '炙',
+  '識' => '識',
+  '什' => '什',
+  '茶' => '茶',
+  '刺' => '刺',
+  '切' => '切',
+  '度' => '度',
+  '拓' => '拓',
+  '糖' => '糖',
+  '宅' => '宅',
+  '洞' => '洞',
+  '暴' => '暴',
+  '輻' => '輻',
+  '行' => '行',
+  '降' => '降',
+  '見' => '見',
+  '廓' => '廓',
+  '兀' => '兀',
+  '嗀' => '嗀',
+  '﨎' => '' . "\0" . '',
+  '﨏' => '' . "\0" . '',
+  '塚' => '塚',
+  '﨑' => '' . "\0" . '',
+  '晴' => '晴',
+  '﨓' => '' . "\0" . '',
+  '﨔' => '' . "\0" . '',
+  '凞' => '凞',
+  '猪' => '猪',
+  '益' => '益',
+  '礼' => '礼',
+  '神' => '神',
+  '祥' => '祥',
+  '福' => '福',
+  '靖' => '靖',
+  '精' => '精',
+  '羽' => '羽',
+  '﨟' => '' . "\0" . '',
+  '蘒' => '蘒',
+  '﨡' => '' . "\0" . '',
+  '諸' => '諸',
+  '﨣' => '' . "\0" . '',
+  '﨤' => '' . "\0" . '',
+  '逸' => '逸',
+  '都' => '都',
+  '﨧' => '' . "\0" . '',
+  '﨨' => '' . "\0" . '',
+  '﨩' => '' . "\0" . '',
+  '飯' => '飯',
+  '飼' => '飼',
+  '館' => '館',
+  '鶴' => '鶴',
+  '郞' => '郞',
+  '隷' => '隷',
+  '侮' => '侮',
+  '僧' => '僧',
+  '免' => '免',
+  '勉' => '勉',
+  '勤' => '勤',
+  '卑' => '卑',
+  '喝' => '喝',
+  '嘆' => '嘆',
+  '器' => '器',
+  '塀' => '塀',
+  '墨' => '墨',
+  '層' => '層',
+  '屮' => '屮',
+  '悔' => '悔',
+  '慨' => '慨',
+  '憎' => '憎',
+  '懲' => '懲',
+  '敏' => '敏',
+  '既' => '既',
+  '暑' => '暑',
+  '梅' => '梅',
+  '海' => '海',
+  '渚' => '渚',
+  '漢' => '漢',
+  '煮' => '煮',
+  '爫' => '爫',
+  '琢' => '琢',
+  '碑' => '碑',
+  '社' => '社',
+  '祉' => '祉',
+  '祈' => '祈',
+  '祐' => '祐',
+  '祖' => '祖',
+  '祝' => '祝',
+  '禍' => '禍',
+  '禎' => '禎',
+  '穀' => '穀',
+  '突' => '突',
+  '節' => '節',
+  '練' => '練',
+  '縉' => '縉',
+  '繁' => '繁',
+  '署' => '署',
+  '者' => '者',
+  '臭' => '臭',
+  '艹' => '艹',
+  '艹' => '艹',
+  '著' => '著',
+  '褐' => '褐',
+  '視' => '視',
+  '謁' => '謁',
+  '謹' => '謹',
+  '賓' => '賓',
+  '贈' => '贈',
+  '辶' => '辶',
+  '逸' => '逸',
+  '難' => '難',
+  '響' => '響',
+  '頻' => '頻',
+  '恵' => '恵',
+  '𤋮' => '𤋮',
+  '舘' => '舘',
+  '並' => '並',
+  '况' => '况',
+  '全' => '全',
+  '侀' => '侀',
+  '充' => '充',
+  '冀' => '冀',
+  '勇' => '勇',
+  '勺' => '勺',
+  '喝' => '喝',
+  '啕' => '啕',
+  '喙' => '喙',
+  '嗢' => '嗢',
+  '塚' => '塚',
+  '墳' => '墳',
+  '奄' => '奄',
+  '奔' => '奔',
+  '婢' => '婢',
+  '嬨' => '嬨',
+  '廒' => '廒',
+  '廙' => '廙',
+  '彩' => '彩',
+  '徭' => '徭',
+  '惘' => '惘',
+  '慎' => '慎',
+  '愈' => '愈',
+  '憎' => '憎',
+  '慠' => '慠',
+  '懲' => '懲',
+  '戴' => '戴',
+  '揄' => '揄',
+  '搜' => '搜',
+  '摒' => '摒',
+  '敖' => '敖',
+  '晴' => '晴',
+  '朗' => '朗',
+  '望' => '望',
+  '杖' => '杖',
+  '歹' => '歹',
+  '殺' => '殺',
+  '流' => '流',
+  '滛' => '滛',
+  '滋' => '滋',
+  '漢' => '漢',
+  '瀞' => '瀞',
+  '煮' => '煮',
+  '瞧' => '瞧',
+  '爵' => '爵',
+  '犯' => '犯',
+  '猪' => '猪',
+  '瑱' => '瑱',
+  '甆' => '甆',
+  '画' => '画',
+  '瘝' => '瘝',
+  '瘟' => '瘟',
+  '益' => '益',
+  '盛' => '盛',
+  '直' => '直',
+  '睊' => '睊',
+  '着' => '着',
+  '磌' => '磌',
+  '窱' => '窱',
+  '節' => '節',
+  '类' => '类',
+  '絛' => '絛',
+  '練' => '練',
+  '缾' => '缾',
+  '者' => '者',
+  '荒' => '荒',
+  '華' => '華',
+  '蝹' => '蝹',
+  '襁' => '襁',
+  '覆' => '覆',
+  '視' => '視',
+  '調' => '調',
+  '諸' => '諸',
+  '請' => '請',
+  '謁' => '謁',
+  '諾' => '諾',
+  '諭' => '諭',
+  '謹' => '謹',
+  '變' => '變',
+  '贈' => '贈',
+  '輸' => '輸',
+  '遲' => '遲',
+  '醙' => '醙',
+  '鉶' => '鉶',
+  '陼' => '陼',
+  '難' => '難',
+  '靖' => '靖',
+  '韛' => '韛',
+  '響' => '響',
+  '頋' => '頋',
+  '頻' => '頻',
+  '鬒' => '鬒',
+  '龜' => '龜',
+  '𢡊' => '𢡊',
+  '𢡄' => '𢡄',
+  '𣏕' => '𣏕',
+  '㮝' => '㮝',
+  '䀘' => '䀘',
+  '䀹' => '䀹',
+  '𥉉' => '𥉉',
+  '𥳐' => '𥳐',
+  '𧻓' => '𧻓',
+  '齃' => '齃',
+  '龎' => '龎',
+  'ff' => 'ff',
+  'fi' => 'fi',
+  'fl' => 'fl',
+  'ffi' => 'ffi',
+  'ffl' => 'ffl',
+  'ſt' => 'ſt',
+  'st' => 'st',
+  'ﬓ' => 'մն',
+  'ﬔ' => 'մե',
+  'ﬕ' => 'մի',
+  'ﬖ' => 'վն',
+  'ﬗ' => 'մխ',
+  'ﬠ' => 'ע',
+  'ﬡ' => 'א',
+  'ﬢ' => 'ד',
+  'ﬣ' => 'ה',
+  'ﬤ' => 'כ',
+  'ﬥ' => 'ל',
+  'ﬦ' => 'ם',
+  'ﬧ' => 'ר',
+  'ﬨ' => 'ת',
+  '﬩' => '+',
+  'ﭏ' => 'אל',
+  '﹉' => '‾',
+  '﹊' => '‾',
+  '﹋' => '‾',
+  '﹌' => '‾',
+  '﹍' => '_',
+  '﹎' => '_',
+  '﹏' => '_',
+  '﹐' => ',',
+  '﹑' => '、',
+  '﹒' => '.',
+  '﹔' => ';',
+  '﹕' => ':',
+  '﹖' => '?',
+  '﹗' => '!',
+  '﹘' => '—',
+  '﹙' => '(',
+  '﹚' => ')',
+  '﹛' => '{',
+  '﹜' => '}',
+  '﹝' => '〔',
+  '﹞' => '〕',
+  '﹟' => '#',
+  '﹠' => '&',
+  '﹡' => '*',
+  '﹢' => '+',
+  '﹣' => '-',
+  '﹤' => '<',
+  '﹥' => '>',
+  '﹦' => '=',
+  '﹨' => '\\',
+  '﹩' => '$',
+  '﹪' => '%',
+  '﹫' => '@',
+  '！' => '!',
+  '＂' => '"',
+  '＃' => '#',
+  '＄' => '$',
+  '％' => '%',
+  '＆' => '&',
+  '＇' => '\'',
+  '（' => '(',
+  '）' => ')',
+  '＊' => '*',
+  '＋' => '+',
+  '，' => ',',
+  '－' => '-',
+  '．' => '.',
+  '／' => '/',
+  '０' => '0',
+  '１' => '1',
+  '２' => '2',
+  '３' => '3',
+  '４' => '4',
+  '５' => '5',
+  '６' => '6',
+  '７' => '7',
+  '８' => '8',
+  '９' => '9',
+  '：' => ':',
+  '；' => ';',
+  '＜' => '<',
+  '＝' => '=',
+  '＞' => '>',
+  '？' => '?',
+  '＠' => '@',
+  'Ａ' => 'A',
+  'Ｂ' => 'B',
+  'Ｃ' => 'C',
+  'Ｄ' => 'D',
+  'Ｅ' => 'E',
+  'Ｆ' => 'F',
+  'Ｇ' => 'G',
+  'Ｈ' => 'H',
+  'Ｉ' => 'I',
+  'Ｊ' => 'J',
+  'Ｋ' => 'K',
+  'Ｌ' => 'L',
+  'Ｍ' => 'M',
+  'Ｎ' => 'N',
+  'Ｏ' => 'O',
+  'Ｐ' => 'P',
+  'Ｑ' => 'Q',
+  'Ｒ' => 'R',
+  'Ｓ' => 'S',
+  'Ｔ' => 'T',
+  'Ｕ' => 'U',
+  'Ｖ' => 'V',
+  'Ｗ' => 'W',
+  'Ｘ' => 'X',
+  'Ｙ' => 'Y',
+  'Ｚ' => 'Z',
+  '［' => '[',
+  '＼' => '\\',
+  '］' => ']',
+  '＾' => '^',
+  '＿' => '_',
+  '｀' => '`',
+  'ａ' => 'a',
+  'ｂ' => 'b',
+  'ｃ' => 'c',
+  'ｄ' => 'd',
+  'ｅ' => 'e',
+  'ｆ' => 'f',
+  'ｇ' => 'g',
+  'ｈ' => 'h',
+  'ｉ' => 'i',
+  'ｊ' => 'j',
+  'ｋ' => 'k',
+  'ｌ' => 'l',
+  'ｍ' => 'm',
+  'ｎ' => 'n',
+  'ｏ' => 'o',
+  'ｐ' => 'p',
+  'ｑ' => 'q',
+  'ｒ' => 'r',
+  'ｓ' => 's',
+  'ｔ' => 't',
+  'ｕ' => 'u',
+  'ｖ' => 'v',
+  'ｗ' => 'w',
+  'ｘ' => 'x',
+  'ｙ' => 'y',
+  'ｚ' => 'z',
+  '｛' => '{',
+  '｜' => '|',
+  '｝' => '}',
+  '～' => '~',
+  '｟' => '⦅',
+  '｠' => '⦆',
+  '｡' => '。',
+  '｢' => '「',
+  '｣' => '」',
+  '､' => '、',
+  '･' => '・',
+  'ｦ' => 'ヲ',
+  'ｧ' => 'ァ',
+  'ｨ' => 'ィ',
+  'ｩ' => 'ゥ',
+  'ｪ' => 'ェ',
+  'ｫ' => 'ォ',
+  'ｬ' => 'ャ',
+  'ｭ' => 'ュ',
+  'ｮ' => 'ョ',
+  'ｯ' => 'ッ',
+  'ｰ' => 'ー',
+  'ｱ' => 'ア',
+  'ｲ' => 'イ',
+  'ｳ' => 'ウ',
+  'ｴ' => 'エ',
+  'ｵ' => 'オ',
+  'ｶ' => 'カ',
+  'ｷ' => 'キ',
+  'ｸ' => 'ク',
+  'ｹ' => 'ケ',
+  'ｺ' => 'コ',
+  'ｻ' => 'サ',
+  'ｼ' => 'シ',
+  'ｽ' => 'ス',
+  'ｾ' => 'セ',
+  'ｿ' => 'ソ',
+  'ﾀ' => 'タ',
+  'ﾁ' => 'チ',
+  'ﾂ' => 'ツ',
+  'ﾃ' => 'テ',
+  'ﾄ' => 'ト',
+  'ﾅ' => 'ナ',
+  'ﾆ' => 'ニ',
+  'ﾇ' => 'ヌ',
+  'ﾈ' => 'ネ',
+  'ﾉ' => 'ノ',
+  'ﾊ' => 'ハ',
+  'ﾋ' => 'ヒ',
+  'ﾌ' => 'フ',
+  'ﾍ' => 'ヘ',
+  'ﾎ' => 'ホ',
+  'ﾏ' => 'マ',
+  'ﾐ' => 'ミ',
+  'ﾑ' => 'ム',
+  'ﾒ' => 'メ',
+  'ﾓ' => 'モ',
+  'ﾔ' => 'ヤ',
+  'ﾕ' => 'ユ',
+  'ﾖ' => 'ヨ',
+  'ﾗ' => 'ラ',
+  'ﾘ' => 'リ',
+  'ﾙ' => 'ル',
+  'ﾚ' => 'レ',
+  'ﾛ' => 'ロ',
+  'ﾜ' => 'ワ',
+  'ﾝ' => 'ン',
+  'ﾞ' => '゙',
+  'ﾟ' => '゚',
+  'ﾠ' => 'ㅤ',
+  'ﾡ' => 'ㄱ',
+  'ﾢ' => 'ㄲ',
+  'ﾣ' => 'ㄳ',
+  'ﾤ' => 'ㄴ',
+  'ﾥ' => 'ㄵ',
+  'ﾦ' => 'ㄶ',
+  'ﾧ' => 'ㄷ',
+  'ﾨ' => 'ㄸ',
+  'ﾩ' => 'ㄹ',
+  'ﾪ' => 'ㄺ',
+  'ﾫ' => 'ㄻ',
+  'ﾬ' => 'ㄼ',
+  'ﾭ' => 'ㄽ',
+  'ﾮ' => 'ㄾ',
+  'ﾯ' => 'ㄿ',
+  'ﾰ' => 'ㅀ',
+  'ﾱ' => 'ㅁ',
+  'ﾲ' => 'ㅂ',
+  'ﾳ' => 'ㅃ',
+  'ﾴ' => 'ㅄ',
+  'ﾵ' => 'ㅅ',
+  'ﾶ' => 'ㅆ',
+  'ﾷ' => 'ㅇ',
+  'ﾸ' => 'ㅈ',
+  'ﾹ' => 'ㅉ',
+  'ﾺ' => 'ㅊ',
+  'ﾻ' => 'ㅋ',
+  'ﾼ' => 'ㅌ',
+  'ﾽ' => 'ㅍ',
+  'ﾾ' => 'ㅎ',
+  'ￂ' => 'ㅏ',
+  'ￃ' => 'ㅐ',
+  'ￄ' => 'ㅑ',
+  'ￅ' => 'ㅒ',
+  'ￆ' => 'ㅓ',
+  'ￇ' => 'ㅔ',
+  'ￊ' => 'ㅕ',
+  'ￋ' => 'ㅖ',
+  'ￌ' => 'ㅗ',
+  'ￍ' => 'ㅘ',
+  'ￎ' => 'ㅙ',
+  'ￏ' => 'ㅚ',
+  'ￒ' => 'ㅛ',
+  'ￓ' => 'ㅜ',
+  'ￔ' => 'ㅝ',
+  'ￕ' => 'ㅞ',
+  'ￖ' => 'ㅟ',
+  'ￗ' => 'ㅠ',
+  'ￚ' => 'ㅡ',
+  'ￛ' => 'ㅢ',
+  'ￜ' => 'ㅣ',
+  '￠' => '¢',
+  '￡' => '£',
+  '￢' => '¬',
+  '￣' => '¯',
+  '￤' => '¦',
+  '￥' => '¥',
+  '￦' => '₩',
+  '￨' => '│',
+  '￩' => '←',
+  '￪' => '↑',
+  '￫' => '→',
+  '￬' => '↓',
+  '￭' => '■',
+  '￮' => '○',
+  '𝐀' => 'A',
+  '𝐁' => 'B',
+  '𝐂' => 'C',
+  '𝐃' => 'D',
+  '𝐄' => 'E',
+  '𝐅' => 'F',
+  '𝐆' => 'G',
+  '𝐇' => 'H',
+  '𝐈' => 'I',
+  '𝐉' => 'J',
+  '𝐊' => 'K',
+  '𝐋' => 'L',
+  '𝐌' => 'M',
+  '𝐍' => 'N',
+  '𝐎' => 'O',
+  '𝐏' => 'P',
+  '𝐐' => 'Q',
+  '𝐑' => 'R',
+  '𝐒' => 'S',
+  '𝐓' => 'T',
+  '𝐔' => 'U',
+  '𝐕' => 'V',
+  '𝐖' => 'W',
+  '𝐗' => 'X',
+  '𝐘' => 'Y',
+  '𝐙' => 'Z',
+  '𝐚' => 'a',
+  '𝐛' => 'b',
+  '𝐜' => 'c',
+  '𝐝' => 'd',
+  '𝐞' => 'e',
+  '𝐟' => 'f',
+  '𝐠' => 'g',
+  '𝐡' => 'h',
+  '𝐢' => 'i',
+  '𝐣' => 'j',
+  '𝐤' => 'k',
+  '𝐥' => 'l',
+  '𝐦' => 'm',
+  '𝐧' => 'n',
+  '𝐨' => 'o',
+  '𝐩' => 'p',
+  '𝐪' => 'q',
+  '𝐫' => 'r',
+  '𝐬' => 's',
+  '𝐭' => 't',
+  '𝐮' => 'u',
+  '𝐯' => 'v',
+  '𝐰' => 'w',
+  '𝐱' => 'x',
+  '𝐲' => 'y',
+  '𝐳' => 'z',
+  '𝐴' => 'A',
+  '𝐵' => 'B',
+  '𝐶' => 'C',
+  '𝐷' => 'D',
+  '𝐸' => 'E',
+  '𝐹' => 'F',
+  '𝐺' => 'G',
+  '𝐻' => 'H',
+  '𝐼' => 'I',
+  '𝐽' => 'J',
+  '𝐾' => 'K',
+  '𝐿' => 'L',
+  '𝑀' => 'M',
+  '𝑁' => 'N',
+  '𝑂' => 'O',
+  '𝑃' => 'P',
+  '𝑄' => 'Q',
+  '𝑅' => 'R',
+  '𝑆' => 'S',
+  '𝑇' => 'T',
+  '𝑈' => 'U',
+  '𝑉' => 'V',
+  '𝑊' => 'W',
+  '𝑋' => 'X',
+  '𝑌' => 'Y',
+  '𝑍' => 'Z',
+  '𝑎' => 'a',
+  '𝑏' => 'b',
+  '𝑐' => 'c',
+  '𝑑' => 'd',
+  '𝑒' => 'e',
+  '𝑓' => 'f',
+  '𝑔' => 'g',
+  '𝑖' => 'i',
+  '𝑗' => 'j',
+  '𝑘' => 'k',
+  '𝑙' => 'l',
+  '𝑚' => 'm',
+  '𝑛' => 'n',
+  '𝑜' => 'o',
+  '𝑝' => 'p',
+  '𝑞' => 'q',
+  '𝑟' => 'r',
+  '𝑠' => 's',
+  '𝑡' => 't',
+  '𝑢' => 'u',
+  '𝑣' => 'v',
+  '𝑤' => 'w',
+  '𝑥' => 'x',
+  '𝑦' => 'y',
+  '𝑧' => 'z',
+  '𝑨' => 'A',
+  '𝑩' => 'B',
+  '𝑪' => 'C',
+  '𝑫' => 'D',
+  '𝑬' => 'E',
+  '𝑭' => 'F',
+  '𝑮' => 'G',
+  '𝑯' => 'H',
+  '𝑰' => 'I',
+  '𝑱' => 'J',
+  '𝑲' => 'K',
+  '𝑳' => 'L',
+  '𝑴' => 'M',
+  '𝑵' => 'N',
+  '𝑶' => 'O',
+  '𝑷' => 'P',
+  '𝑸' => 'Q',
+  '𝑹' => 'R',
+  '𝑺' => 'S',
+  '𝑻' => 'T',
+  '𝑼' => 'U',
+  '𝑽' => 'V',
+  '𝑾' => 'W',
+  '𝑿' => 'X',
+  '𝒀' => 'Y',
+  '𝒁' => 'Z',
+  '𝒂' => 'a',
+  '𝒃' => 'b',
+  '𝒄' => 'c',
+  '𝒅' => 'd',
+  '𝒆' => 'e',
+  '𝒇' => 'f',
+  '𝒈' => 'g',
+  '𝒉' => 'h',
+  '𝒊' => 'i',
+  '𝒋' => 'j',
+  '𝒌' => 'k',
+  '𝒍' => 'l',
+  '𝒎' => 'm',
+  '𝒏' => 'n',
+  '𝒐' => 'o',
+  '𝒑' => 'p',
+  '𝒒' => 'q',
+  '𝒓' => 'r',
+  '𝒔' => 's',
+  '𝒕' => 't',
+  '𝒖' => 'u',
+  '𝒗' => 'v',
+  '𝒘' => 'w',
+  '𝒙' => 'x',
+  '𝒚' => 'y',
+  '𝒛' => 'z',
+  '𝒜' => 'A',
+  '𝒞' => 'C',
+  '𝒟' => 'D',
+  '𝒢' => 'G',
+  '𝒥' => 'J',
+  '𝒦' => 'K',
+  '𝒩' => 'N',
+  '𝒪' => 'O',
+  '𝒫' => 'P',
+  '𝒬' => 'Q',
+  '𝒮' => 'S',
+  '𝒯' => 'T',
+  '𝒰' => 'U',
+  '𝒱' => 'V',
+  '𝒲' => 'W',
+  '𝒳' => 'X',
+  '𝒴' => 'Y',
+  '𝒵' => 'Z',
+  '𝒶' => 'a',
+  '𝒷' => 'b',
+  '𝒸' => 'c',
+  '𝒹' => 'd',
+  '𝒻' => 'f',
+  '𝒽' => 'h',
+  '𝒾' => 'i',
+  '𝒿' => 'j',
+  '𝓀' => 'k',
+  '𝓁' => 'l',
+  '𝓂' => 'm',
+  '𝓃' => 'n',
+  '𝓅' => 'p',
+  '𝓆' => 'q',
+  '𝓇' => 'r',
+  '𝓈' => 's',
+  '𝓉' => 't',
+  '𝓊' => 'u',
+  '𝓋' => 'v',
+  '𝓌' => 'w',
+  '𝓍' => 'x',
+  '𝓎' => 'y',
+  '𝓏' => 'z',
+  '𝓐' => 'A',
+  '𝓑' => 'B',
+  '𝓒' => 'C',
+  '𝓓' => 'D',
+  '𝓔' => 'E',
+  '𝓕' => 'F',
+  '𝓖' => 'G',
+  '𝓗' => 'H',
+  '𝓘' => 'I',
+  '𝓙' => 'J',
+  '𝓚' => 'K',
+  '𝓛' => 'L',
+  '𝓜' => 'M',
+  '𝓝' => 'N',
+  '𝓞' => 'O',
+  '𝓟' => 'P',
+  '𝓠' => 'Q',
+  '𝓡' => 'R',
+  '𝓢' => 'S',
+  '𝓣' => 'T',
+  '𝓤' => 'U',
+  '𝓥' => 'V',
+  '𝓦' => 'W',
+  '𝓧' => 'X',
+  '𝓨' => 'Y',
+  '𝓩' => 'Z',
+  '𝓪' => 'a',
+  '𝓫' => 'b',
+  '𝓬' => 'c',
+  '𝓭' => 'd',
+  '𝓮' => 'e',
+  '𝓯' => 'f',
+  '𝓰' => 'g',
+  '𝓱' => 'h',
+  '𝓲' => 'i',
+  '𝓳' => 'j',
+  '𝓴' => 'k',
+  '𝓵' => 'l',
+  '𝓶' => 'm',
+  '𝓷' => 'n',
+  '𝓸' => 'o',
+  '𝓹' => 'p',
+  '𝓺' => 'q',
+  '𝓻' => 'r',
+  '𝓼' => 's',
+  '𝓽' => 't',
+  '𝓾' => 'u',
+  '𝓿' => 'v',
+  '𝔀' => 'w',
+  '𝔁' => 'x',
+  '𝔂' => 'y',
+  '𝔃' => 'z',
+  '𝔄' => 'A',
+  '𝔅' => 'B',
+  '𝔇' => 'D',
+  '𝔈' => 'E',
+  '𝔉' => 'F',
+  '𝔊' => 'G',
+  '𝔍' => 'J',
+  '𝔎' => 'K',
+  '𝔏' => 'L',
+  '𝔐' => 'M',
+  '𝔑' => 'N',
+  '𝔒' => 'O',
+  '𝔓' => 'P',
+  '𝔔' => 'Q',
+  '𝔖' => 'S',
+  '𝔗' => 'T',
+  '𝔘' => 'U',
+  '𝔙' => 'V',
+  '𝔚' => 'W',
+  '𝔛' => 'X',
+  '𝔜' => 'Y',
+  '𝔞' => 'a',
+  '𝔟' => 'b',
+  '𝔠' => 'c',
+  '𝔡' => 'd',
+  '𝔢' => 'e',
+  '𝔣' => 'f',
+  '𝔤' => 'g',
+  '𝔥' => 'h',
+  '𝔦' => 'i',
+  '𝔧' => 'j',
+  '𝔨' => 'k',
+  '𝔩' => 'l',
+  '𝔪' => 'm',
+  '𝔫' => 'n',
+  '𝔬' => 'o',
+  '𝔭' => 'p',
+  '𝔮' => 'q',
+  '𝔯' => 'r',
+  '𝔰' => 's',
+  '𝔱' => 't',
+  '𝔲' => 'u',
+  '𝔳' => 'v',
+  '𝔴' => 'w',
+  '𝔵' => 'x',
+  '𝔶' => 'y',
+  '𝔷' => 'z',
+  '𝔸' => 'A',
+  '𝔹' => 'B',
+  '𝔻' => 'D',
+  '𝔼' => 'E',
+  '𝔽' => 'F',
+  '𝔾' => 'G',
+  '𝕀' => 'I',
+  '𝕁' => 'J',
+  '𝕂' => 'K',
+  '𝕃' => 'L',
+  '𝕄' => 'M',
+  '𝕆' => 'O',
+  '𝕊' => 'S',
+  '𝕋' => 'T',
+  '𝕌' => 'U',
+  '𝕍' => 'V',
+  '𝕎' => 'W',
+  '𝕏' => 'X',
+  '𝕐' => 'Y',
+  '𝕒' => 'a',
+  '𝕓' => 'b',
+  '𝕔' => 'c',
+  '𝕕' => 'd',
+  '𝕖' => 'e',
+  '𝕗' => 'f',
+  '𝕘' => 'g',
+  '𝕙' => 'h',
+  '𝕚' => 'i',
+  '𝕛' => 'j',
+  '𝕜' => 'k',
+  '𝕝' => 'l',
+  '𝕞' => 'm',
+  '𝕟' => 'n',
+  '𝕠' => 'o',
+  '𝕡' => 'p',
+  '𝕢' => 'q',
+  '𝕣' => 'r',
+  '𝕤' => 's',
+  '𝕥' => 't',
+  '𝕦' => 'u',
+  '𝕧' => 'v',
+  '𝕨' => 'w',
+  '𝕩' => 'x',
+  '𝕪' => 'y',
+  '𝕫' => 'z',
+  '𝕬' => 'A',
+  '𝕭' => 'B',
+  '𝕮' => 'C',
+  '𝕯' => 'D',
+  '𝕰' => 'E',
+  '𝕱' => 'F',
+  '𝕲' => 'G',
+  '𝕳' => 'H',
+  '𝕴' => 'I',
+  '𝕵' => 'J',
+  '𝕶' => 'K',
+  '𝕷' => 'L',
+  '𝕸' => 'M',
+  '𝕹' => 'N',
+  '𝕺' => 'O',
+  '𝕻' => 'P',
+  '𝕼' => 'Q',
+  '𝕽' => 'R',
+  '𝕾' => 'S',
+  '𝕿' => 'T',
+  '𝖀' => 'U',
+  '𝖁' => 'V',
+  '𝖂' => 'W',
+  '𝖃' => 'X',
+  '𝖄' => 'Y',
+  '𝖅' => 'Z',
+  '𝖆' => 'a',
+  '𝖇' => 'b',
+  '𝖈' => 'c',
+  '𝖉' => 'd',
+  '𝖊' => 'e',
+  '𝖋' => 'f',
+  '𝖌' => 'g',
+  '𝖍' => 'h',
+  '𝖎' => 'i',
+  '𝖏' => 'j',
+  '𝖐' => 'k',
+  '𝖑' => 'l',
+  '𝖒' => 'm',
+  '𝖓' => 'n',
+  '𝖔' => 'o',
+  '𝖕' => 'p',
+  '𝖖' => 'q',
+  '𝖗' => 'r',
+  '𝖘' => 's',
+  '𝖙' => 't',
+  '𝖚' => 'u',
+  '𝖛' => 'v',
+  '𝖜' => 'w',
+  '𝖝' => 'x',
+  '𝖞' => 'y',
+  '𝖟' => 'z',
+  '𝖠' => 'A',
+  '𝖡' => 'B',
+  '𝖢' => 'C',
+  '𝖣' => 'D',
+  '𝖤' => 'E',
+  '𝖥' => 'F',
+  '𝖦' => 'G',
+  '𝖧' => 'H',
+  '𝖨' => 'I',
+  '𝖩' => 'J',
+  '𝖪' => 'K',
+  '𝖫' => 'L',
+  '𝖬' => 'M',
+  '𝖭' => 'N',
+  '𝖮' => 'O',
+  '𝖯' => 'P',
+  '𝖰' => 'Q',
+  '𝖱' => 'R',
+  '𝖲' => 'S',
+  '𝖳' => 'T',
+  '𝖴' => 'U',
+  '𝖵' => 'V',
+  '𝖶' => 'W',
+  '𝖷' => 'X',
+  '𝖸' => 'Y',
+  '𝖹' => 'Z',
+  '𝖺' => 'a',
+  '𝖻' => 'b',
+  '𝖼' => 'c',
+  '𝖽' => 'd',
+  '𝖾' => 'e',
+  '𝖿' => 'f',
+  '𝗀' => 'g',
+  '𝗁' => 'h',
+  '𝗂' => 'i',
+  '𝗃' => 'j',
+  '𝗄' => 'k',
+  '𝗅' => 'l',
+  '𝗆' => 'm',
+  '𝗇' => 'n',
+  '𝗈' => 'o',
+  '𝗉' => 'p',
+  '𝗊' => 'q',
+  '𝗋' => 'r',
+  '𝗌' => 's',
+  '𝗍' => 't',
+  '𝗎' => 'u',
+  '𝗏' => 'v',
+  '𝗐' => 'w',
+  '𝗑' => 'x',
+  '𝗒' => 'y',
+  '𝗓' => 'z',
+  '𝗔' => 'A',
+  '𝗕' => 'B',
+  '𝗖' => 'C',
+  '𝗗' => 'D',
+  '𝗘' => 'E',
+  '𝗙' => 'F',
+  '𝗚' => 'G',
+  '𝗛' => 'H',
+  '𝗜' => 'I',
+  '𝗝' => 'J',
+  '𝗞' => 'K',
+  '𝗟' => 'L',
+  '𝗠' => 'M',
+  '𝗡' => 'N',
+  '𝗢' => 'O',
+  '𝗣' => 'P',
+  '𝗤' => 'Q',
+  '𝗥' => 'R',
+  '𝗦' => 'S',
+  '𝗧' => 'T',
+  '𝗨' => 'U',
+  '𝗩' => 'V',
+  '𝗪' => 'W',
+  '𝗫' => 'X',
+  '𝗬' => 'Y',
+  '𝗭' => 'Z',
+  '𝗮' => 'a',
+  '𝗯' => 'b',
+  '𝗰' => 'c',
+  '𝗱' => 'd',
+  '𝗲' => 'e',
+  '𝗳' => 'f',
+  '𝗴' => 'g',
+  '𝗵' => 'h',
+  '𝗶' => 'i',
+  '𝗷' => 'j',
+  '𝗸' => 'k',
+  '𝗹' => 'l',
+  '𝗺' => 'm',
+  '𝗻' => 'n',
+  '𝗼' => 'o',
+  '𝗽' => 'p',
+  '𝗾' => 'q',
+  '𝗿' => 'r',
+  '𝘀' => 's',
+  '𝘁' => 't',
+  '𝘂' => 'u',
+  '𝘃' => 'v',
+  '𝘄' => 'w',
+  '𝘅' => 'x',
+  '𝘆' => 'y',
+  '𝘇' => 'z',
+  '𝘈' => 'A',
+  '𝘉' => 'B',
+  '𝘊' => 'C',
+  '𝘋' => 'D',
+  '𝘌' => 'E',
+  '𝘍' => 'F',
+  '𝘎' => 'G',
+  '𝘏' => 'H',
+  '𝘐' => 'I',
+  '𝘑' => 'J',
+  '𝘒' => 'K',
+  '𝘓' => 'L',
+  '𝘔' => 'M',
+  '𝘕' => 'N',
+  '𝘖' => 'O',
+  '𝘗' => 'P',
+  '𝘘' => 'Q',
+  '𝘙' => 'R',
+  '𝘚' => 'S',
+  '𝘛' => 'T',
+  '𝘜' => 'U',
+  '𝘝' => 'V',
+  '𝘞' => 'W',
+  '𝘟' => 'X',
+  '𝘠' => 'Y',
+  '𝘡' => 'Z',
+  '𝘢' => 'a',
+  '𝘣' => 'b',
+  '𝘤' => 'c',
+  '𝘥' => 'd',
+  '𝘦' => 'e',
+  '𝘧' => 'f',
+  '𝘨' => 'g',
+  '𝘩' => 'h',
+  '𝘪' => 'i',
+  '𝘫' => 'j',
+  '𝘬' => 'k',
+  '𝘭' => 'l',
+  '𝘮' => 'm',
+  '𝘯' => 'n',
+  '𝘰' => 'o',
+  '𝘱' => 'p',
+  '𝘲' => 'q',
+  '𝘳' => 'r',
+  '𝘴' => 's',
+  '𝘵' => 't',
+  '𝘶' => 'u',
+  '𝘷' => 'v',
+  '𝘸' => 'w',
+  '𝘹' => 'x',
+  '𝘺' => 'y',
+  '𝘻' => 'z',
+  '𝘼' => 'A',
+  '𝘽' => 'B',
+  '𝘾' => 'C',
+  '𝘿' => 'D',
+  '𝙀' => 'E',
+  '𝙁' => 'F',
+  '𝙂' => 'G',
+  '𝙃' => 'H',
+  '𝙄' => 'I',
+  '𝙅' => 'J',
+  '𝙆' => 'K',
+  '𝙇' => 'L',
+  '𝙈' => 'M',
+  '𝙉' => 'N',
+  '𝙊' => 'O',
+  '𝙋' => 'P',
+  '𝙌' => 'Q',
+  '𝙍' => 'R',
+  '𝙎' => 'S',
+  '𝙏' => 'T',
+  '𝙐' => 'U',
+  '𝙑' => 'V',
+  '𝙒' => 'W',
+  '𝙓' => 'X',
+  '𝙔' => 'Y',
+  '𝙕' => 'Z',
+  '𝙖' => 'a',
+  '𝙗' => 'b',
+  '𝙘' => 'c',
+  '𝙙' => 'd',
+  '𝙚' => 'e',
+  '𝙛' => 'f',
+  '𝙜' => 'g',
+  '𝙝' => 'h',
+  '𝙞' => 'i',
+  '𝙟' => 'j',
+  '𝙠' => 'k',
+  '𝙡' => 'l',
+  '𝙢' => 'm',
+  '𝙣' => 'n',
+  '𝙤' => 'o',
+  '𝙥' => 'p',
+  '𝙦' => 'q',
+  '𝙧' => 'r',
+  '𝙨' => 's',
+  '𝙩' => 't',
+  '𝙪' => 'u',
+  '𝙫' => 'v',
+  '𝙬' => 'w',
+  '𝙭' => 'x',
+  '𝙮' => 'y',
+  '𝙯' => 'z',
+  '𝙰' => 'A',
+  '𝙱' => 'B',
+  '𝙲' => 'C',
+  '𝙳' => 'D',
+  '𝙴' => 'E',
+  '𝙵' => 'F',
+  '𝙶' => 'G',
+  '𝙷' => 'H',
+  '𝙸' => 'I',
+  '𝙹' => 'J',
+  '𝙺' => 'K',
+  '𝙻' => 'L',
+  '𝙼' => 'M',
+  '𝙽' => 'N',
+  '𝙾' => 'O',
+  '𝙿' => 'P',
+  '𝚀' => 'Q',
+  '𝚁' => 'R',
+  '𝚂' => 'S',
+  '𝚃' => 'T',
+  '𝚄' => 'U',
+  '𝚅' => 'V',
+  '𝚆' => 'W',
+  '𝚇' => 'X',
+  '𝚈' => 'Y',
+  '𝚉' => 'Z',
+  '𝚊' => 'a',
+  '𝚋' => 'b',
+  '𝚌' => 'c',
+  '𝚍' => 'd',
+  '𝚎' => 'e',
+  '𝚏' => 'f',
+  '𝚐' => 'g',
+  '𝚑' => 'h',
+  '𝚒' => 'i',
+  '𝚓' => 'j',
+  '𝚔' => 'k',
+  '𝚕' => 'l',
+  '𝚖' => 'm',
+  '𝚗' => 'n',
+  '𝚘' => 'o',
+  '𝚙' => 'p',
+  '𝚚' => 'q',
+  '𝚛' => 'r',
+  '𝚜' => 's',
+  '𝚝' => 't',
+  '𝚞' => 'u',
+  '𝚟' => 'v',
+  '𝚠' => 'w',
+  '𝚡' => 'x',
+  '𝚢' => 'y',
+  '𝚣' => 'z',
+  '𝚤' => 'ı',
+  '𝚥' => 'ȷ',
+  '𝚨' => 'Α',
+  '𝚩' => 'Β',
+  '𝚪' => 'Γ',
+  '𝚫' => 'Δ',
+  '𝚬' => 'Ε',
+  '𝚭' => 'Ζ',
+  '𝚮' => 'Η',
+  '𝚯' => 'Θ',
+  '𝚰' => 'Ι',
+  '𝚱' => 'Κ',
+  '𝚲' => 'Λ',
+  '𝚳' => 'Μ',
+  '𝚴' => 'Ν',
+  '𝚵' => 'Ξ',
+  '𝚶' => 'Ο',
+  '𝚷' => 'Π',
+  '𝚸' => 'Ρ',
+  '𝚹' => 'ϴ',
+  '𝚺' => 'Σ',
+  '𝚻' => 'Τ',
+  '𝚼' => 'Υ',
+  '𝚽' => 'Φ',
+  '𝚾' => 'Χ',
+  '𝚿' => 'Ψ',
+  '𝛀' => 'Ω',
+  '𝛁' => '∇',
+  '𝛂' => 'α',
+  '𝛃' => 'β',
+  '𝛄' => 'γ',
+  '𝛅' => 'δ',
+  '𝛆' => 'ε',
+  '𝛇' => 'ζ',
+  '𝛈' => 'η',
+  '𝛉' => 'θ',
+  '𝛊' => 'ι',
+  '𝛋' => 'κ',
+  '𝛌' => 'λ',
+  '𝛍' => 'μ',
+  '𝛎' => 'ν',
+  '𝛏' => 'ξ',
+  '𝛐' => 'ο',
+  '𝛑' => 'π',
+  '𝛒' => 'ρ',
+  '𝛓' => 'ς',
+  '𝛔' => 'σ',
+  '𝛕' => 'τ',
+  '𝛖' => 'υ',
+  '𝛗' => 'φ',
+  '𝛘' => 'χ',
+  '𝛙' => 'ψ',
+  '𝛚' => 'ω',
+  '𝛛' => '∂',
+  '𝛜' => 'ϵ',
+  '𝛝' => 'ϑ',
+  '𝛞' => 'ϰ',
+  '𝛟' => 'ϕ',
+  '𝛠' => 'ϱ',
+  '𝛡' => 'ϖ',
+  '𝛢' => 'Α',
+  '𝛣' => 'Β',
+  '𝛤' => 'Γ',
+  '𝛥' => 'Δ',
+  '𝛦' => 'Ε',
+  '𝛧' => 'Ζ',
+  '𝛨' => 'Η',
+  '𝛩' => 'Θ',
+  '𝛪' => 'Ι',
+  '𝛫' => 'Κ',
+  '𝛬' => 'Λ',
+  '𝛭' => 'Μ',
+  '𝛮' => 'Ν',
+  '𝛯' => 'Ξ',
+  '𝛰' => 'Ο',
+  '𝛱' => 'Π',
+  '𝛲' => 'Ρ',
+  '𝛳' => 'ϴ',
+  '𝛴' => 'Σ',
+  '𝛵' => 'Τ',
+  '𝛶' => 'Υ',
+  '𝛷' => 'Φ',
+  '𝛸' => 'Χ',
+  '𝛹' => 'Ψ',
+  '𝛺' => 'Ω',
+  '𝛻' => '∇',
+  '𝛼' => 'α',
+  '𝛽' => 'β',
+  '𝛾' => 'γ',
+  '𝛿' => 'δ',
+  '𝜀' => 'ε',
+  '𝜁' => 'ζ',
+  '𝜂' => 'η',
+  '𝜃' => 'θ',
+  '𝜄' => 'ι',
+  '𝜅' => 'κ',
+  '𝜆' => 'λ',
+  '𝜇' => 'μ',
+  '𝜈' => 'ν',
+  '𝜉' => 'ξ',
+  '𝜊' => 'ο',
+  '𝜋' => 'π',
+  '𝜌' => 'ρ',
+  '𝜍' => 'ς',
+  '𝜎' => 'σ',
+  '𝜏' => 'τ',
+  '𝜐' => 'υ',
+  '𝜑' => 'φ',
+  '𝜒' => 'χ',
+  '𝜓' => 'ψ',
+  '𝜔' => 'ω',
+  '𝜕' => '∂',
+  '𝜖' => 'ϵ',
+  '𝜗' => 'ϑ',
+  '𝜘' => 'ϰ',
+  '𝜙' => 'ϕ',
+  '𝜚' => 'ϱ',
+  '𝜛' => 'ϖ',
+  '𝜜' => 'Α',
+  '𝜝' => 'Β',
+  '𝜞' => 'Γ',
+  '𝜟' => 'Δ',
+  '𝜠' => 'Ε',
+  '𝜡' => 'Ζ',
+  '𝜢' => 'Η',
+  '𝜣' => 'Θ',
+  '𝜤' => 'Ι',
+  '𝜥' => 'Κ',
+  '𝜦' => 'Λ',
+  '𝜧' => 'Μ',
+  '𝜨' => 'Ν',
+  '𝜩' => 'Ξ',
+  '𝜪' => 'Ο',
+  '𝜫' => 'Π',
+  '𝜬' => 'Ρ',
+  '𝜭' => 'ϴ',
+  '𝜮' => 'Σ',
+  '𝜯' => 'Τ',
+  '𝜰' => 'Υ',
+  '𝜱' => 'Φ',
+  '𝜲' => 'Χ',
+  '𝜳' => 'Ψ',
+  '𝜴' => 'Ω',
+  '𝜵' => '∇',
+  '𝜶' => 'α',
+  '𝜷' => 'β',
+  '𝜸' => 'γ',
+  '𝜹' => 'δ',
+  '𝜺' => 'ε',
+  '𝜻' => 'ζ',
+  '𝜼' => 'η',
+  '𝜽' => 'θ',
+  '𝜾' => 'ι',
+  '𝜿' => 'κ',
+  '𝝀' => 'λ',
+  '𝝁' => 'μ',
+  '𝝂' => 'ν',
+  '𝝃' => 'ξ',
+  '𝝄' => 'ο',
+  '𝝅' => 'π',
+  '𝝆' => 'ρ',
+  '𝝇' => 'ς',
+  '𝝈' => 'σ',
+  '𝝉' => 'τ',
+  '𝝊' => 'υ',
+  '𝝋' => 'φ',
+  '𝝌' => 'χ',
+  '𝝍' => 'ψ',
+  '𝝎' => 'ω',
+  '𝝏' => '∂',
+  '𝝐' => 'ϵ',
+  '𝝑' => 'ϑ',
+  '𝝒' => 'ϰ',
+  '𝝓' => 'ϕ',
+  '𝝔' => 'ϱ',
+  '𝝕' => 'ϖ',
+  '𝝖' => 'Α',
+  '𝝗' => 'Β',
+  '𝝘' => 'Γ',
+  '𝝙' => 'Δ',
+  '𝝚' => 'Ε',
+  '𝝛' => 'Ζ',
+  '𝝜' => 'Η',
+  '𝝝' => 'Θ',
+  '𝝞' => 'Ι',
+  '𝝟' => 'Κ',
+  '𝝠' => 'Λ',
+  '𝝡' => 'Μ',
+  '𝝢' => 'Ν',
+  '𝝣' => 'Ξ',
+  '𝝤' => 'Ο',
+  '𝝥' => 'Π',
+  '𝝦' => 'Ρ',
+  '𝝧' => 'ϴ',
+  '𝝨' => 'Σ',
+  '𝝩' => 'Τ',
+  '𝝪' => 'Υ',
+  '𝝫' => 'Φ',
+  '𝝬' => 'Χ',
+  '𝝭' => 'Ψ',
+  '𝝮' => 'Ω',
+  '𝝯' => '∇',
+  '𝝰' => 'α',
+  '𝝱' => 'β',
+  '𝝲' => 'γ',
+  '𝝳' => 'δ',
+  '𝝴' => 'ε',
+  '𝝵' => 'ζ',
+  '𝝶' => 'η',
+  '𝝷' => 'θ',
+  '𝝸' => 'ι',
+  '𝝹' => 'κ',
+  '𝝺' => 'λ',
+  '𝝻' => 'μ',
+  '𝝼' => 'ν',
+  '𝝽' => 'ξ',
+  '𝝾' => 'ο',
+  '𝝿' => 'π',
+  '𝞀' => 'ρ',
+  '𝞁' => 'ς',
+  '𝞂' => 'σ',
+  '𝞃' => 'τ',
+  '𝞄' => 'υ',
+  '𝞅' => 'φ',
+  '𝞆' => 'χ',
+  '𝞇' => 'ψ',
+  '𝞈' => 'ω',
+  '𝞉' => '∂',
+  '𝞊' => 'ϵ',
+  '𝞋' => 'ϑ',
+  '𝞌' => 'ϰ',
+  '𝞍' => 'ϕ',
+  '𝞎' => 'ϱ',
+  '𝞏' => 'ϖ',
+  '𝞐' => 'Α',
+  '𝞑' => 'Β',
+  '𝞒' => 'Γ',
+  '𝞓' => 'Δ',
+  '𝞔' => 'Ε',
+  '𝞕' => 'Ζ',
+  '𝞖' => 'Η',
+  '𝞗' => 'Θ',
+  '𝞘' => 'Ι',
+  '𝞙' => 'Κ',
+  '𝞚' => 'Λ',
+  '𝞛' => 'Μ',
+  '𝞜' => 'Ν',
+  '𝞝' => 'Ξ',
+  '𝞞' => 'Ο',
+  '𝞟' => 'Π',
+  '𝞠' => 'Ρ',
+  '𝞡' => 'ϴ',
+  '𝞢' => 'Σ',
+  '𝞣' => 'Τ',
+  '𝞤' => 'Υ',
+  '𝞥' => 'Φ',
+  '𝞦' => 'Χ',
+  '𝞧' => 'Ψ',
+  '𝞨' => 'Ω',
+  '𝞩' => '∇',
+  '𝞪' => 'α',
+  '𝞫' => 'β',
+  '𝞬' => 'γ',
+  '𝞭' => 'δ',
+  '𝞮' => 'ε',
+  '𝞯' => 'ζ',
+  '𝞰' => 'η',
+  '𝞱' => 'θ',
+  '𝞲' => 'ι',
+  '𝞳' => 'κ',
+  '𝞴' => 'λ',
+  '𝞵' => 'μ',
+  '𝞶' => 'ν',
+  '𝞷' => 'ξ',
+  '𝞸' => 'ο',
+  '𝞹' => 'π',
+  '𝞺' => 'ρ',
+  '𝞻' => 'ς',
+  '𝞼' => 'σ',
+  '𝞽' => 'τ',
+  '𝞾' => 'υ',
+  '𝞿' => 'φ',
+  '𝟀' => 'χ',
+  '𝟁' => 'ψ',
+  '𝟂' => 'ω',
+  '𝟃' => '∂',
+  '𝟄' => 'ϵ',
+  '𝟅' => 'ϑ',
+  '𝟆' => 'ϰ',
+  '𝟇' => 'ϕ',
+  '𝟈' => 'ϱ',
+  '𝟉' => 'ϖ',
+  '𝟊' => 'Ϝ',
+  '𝟋' => 'ϝ',
+  '𝟎' => '0',
+  '𝟏' => '1',
+  '𝟐' => '2',
+  '𝟑' => '3',
+  '𝟒' => '4',
+  '𝟓' => '5',
+  '𝟔' => '6',
+  '𝟕' => '7',
+  '𝟖' => '8',
+  '𝟗' => '9',
+  '𝟘' => '0',
+  '𝟙' => '1',
+  '𝟚' => '2',
+  '𝟛' => '3',
+  '𝟜' => '4',
+  '𝟝' => '5',
+  '𝟞' => '6',
+  '𝟟' => '7',
+  '𝟠' => '8',
+  '𝟡' => '9',
+  '𝟢' => '0',
+  '𝟣' => '1',
+  '𝟤' => '2',
+  '𝟥' => '3',
+  '𝟦' => '4',
+  '𝟧' => '5',
+  '𝟨' => '6',
+  '𝟩' => '7',
+  '𝟪' => '8',
+  '𝟫' => '9',
+  '𝟬' => '0',
+  '𝟭' => '1',
+  '𝟮' => '2',
+  '𝟯' => '3',
+  '𝟰' => '4',
+  '𝟱' => '5',
+  '𝟲' => '6',
+  '𝟳' => '7',
+  '𝟴' => '8',
+  '𝟵' => '9',
+  '𝟶' => '0',
+  '𝟷' => '1',
+  '𝟸' => '2',
+  '𝟹' => '3',
+  '𝟺' => '4',
+  '𝟻' => '5',
+  '𝟼' => '6',
+  '𝟽' => '7',
+  '𝟾' => '8',
+  '𝟿' => '9',
+  '𞸀' => 'ا',
+  '𞸁' => 'ب',
+  '𞸂' => 'ج',
+  '𞸃' => 'د',
+  '𞸅' => 'و',
+  '𞸆' => 'ز',
+  '𞸇' => 'ح',
+  '𞸈' => 'ط',
+  '𞸉' => 'ي',
+  '𞸊' => 'ك',
+  '𞸋' => 'ل',
+  '𞸌' => 'م',
+  '𞸍' => 'ن',
+  '𞸎' => 'س',
+  '𞸏' => 'ع',
+  '𞸐' => 'ف',
+  '𞸑' => 'ص',
+  '𞸒' => 'ق',
+  '𞸓' => 'ر',
+  '𞸔' => 'ش',
+  '𞸕' => 'ت',
+  '𞸖' => 'ث',
+  '𞸗' => 'خ',
+  '𞸘' => 'ذ',
+  '𞸙' => 'ض',
+  '𞸚' => 'ظ',
+  '𞸛' => 'غ',
+  '𞸜' => 'ٮ',
+  '𞸝' => 'ں',
+  '𞸞' => 'ڡ',
+  '𞸟' => 'ٯ',
+  '𞸡' => 'ب',
+  '𞸢' => 'ج',
+  '𞸤' => 'ه',
+  '𞸧' => 'ح',
+  '𞸩' => 'ي',
+  '𞸪' => 'ك',
+  '𞸫' => 'ل',
+  '𞸬' => 'م',
+  '𞸭' => 'ن',
+  '𞸮' => 'س',
+  '𞸯' => 'ع',
+  '𞸰' => 'ف',
+  '𞸱' => 'ص',
+  '𞸲' => 'ق',
+  '𞸴' => 'ش',
+  '𞸵' => 'ت',
+  '𞸶' => 'ث',
+  '𞸷' => 'خ',
+  '𞸹' => 'ض',
+  '𞸻' => 'غ',
+  '𞹂' => 'ج',
+  '𞹇' => 'ح',
+  '𞹉' => 'ي',
+  '𞹋' => 'ل',
+  '𞹍' => 'ن',
+  '𞹎' => 'س',
+  '𞹏' => 'ع',
+  '𞹑' => 'ص',
+  '𞹒' => 'ق',
+  '𞹔' => 'ش',
+  '𞹗' => 'خ',
+  '𞹙' => 'ض',
+  '𞹛' => 'غ',
+  '𞹝' => 'ں',
+  '𞹟' => 'ٯ',
+  '𞹡' => 'ب',
+  '𞹢' => 'ج',
+  '𞹤' => 'ه',
+  '𞹧' => 'ح',
+  '𞹨' => 'ط',
+  '𞹩' => 'ي',
+  '𞹪' => 'ك',
+  '𞹬' => 'م',
+  '𞹭' => 'ن',
+  '𞹮' => 'س',
+  '𞹯' => 'ع',
+  '𞹰' => 'ف',
+  '𞹱' => 'ص',
+  '𞹲' => 'ق',
+  '𞹴' => 'ش',
+  '𞹵' => 'ت',
+  '𞹶' => 'ث',
+  '𞹷' => 'خ',
+  '𞹹' => 'ض',
+  '𞹺' => 'ظ',
+  '𞹻' => 'غ',
+  '𞹼' => 'ٮ',
+  '𞹾' => 'ڡ',
+  '𞺀' => 'ا',
+  '𞺁' => 'ب',
+  '𞺂' => 'ج',
+  '𞺃' => 'د',
+  '𞺄' => 'ه',
+  '𞺅' => 'و',
+  '𞺆' => 'ز',
+  '𞺇' => 'ح',
+  '𞺈' => 'ط',
+  '𞺉' => 'ي',
+  '𞺋' => 'ل',
+  '𞺌' => 'م',
+  '𞺍' => 'ن',
+  '𞺎' => 'س',
+  '𞺏' => 'ع',
+  '𞺐' => 'ف',
+  '𞺑' => 'ص',
+  '𞺒' => 'ق',
+  '𞺓' => 'ر',
+  '𞺔' => 'ش',
+  '𞺕' => 'ت',
+  '𞺖' => 'ث',
+  '𞺗' => 'خ',
+  '𞺘' => 'ذ',
+  '𞺙' => 'ض',
+  '𞺚' => 'ظ',
+  '𞺛' => 'غ',
+  '𞺡' => 'ب',
+  '𞺢' => 'ج',
+  '𞺣' => 'د',
+  '𞺥' => 'و',
+  '𞺦' => 'ز',
+  '𞺧' => 'ح',
+  '𞺨' => 'ط',
+  '𞺩' => 'ي',
+  '𞺫' => 'ل',
+  '𞺬' => 'م',
+  '𞺭' => 'ن',
+  '𞺮' => 'س',
+  '𞺯' => 'ع',
+  '𞺰' => 'ف',
+  '𞺱' => 'ص',
+  '𞺲' => 'ق',
+  '𞺳' => 'ر',
+  '𞺴' => 'ش',
+  '𞺵' => 'ت',
+  '𞺶' => 'ث',
+  '𞺷' => 'خ',
+  '𞺸' => 'ذ',
+  '𞺹' => 'ض',
+  '𞺺' => 'ظ',
+  '𞺻' => 'غ',
+  '🄀' => '0.',
+  '🄁' => '0,',
+  '🄂' => '1,',
+  '🄃' => '2,',
+  '🄄' => '3,',
+  '🄅' => '4,',
+  '🄆' => '5,',
+  '🄇' => '6,',
+  '🄈' => '7,',
+  '🄉' => '8,',
+  '🄊' => '9,',
+  '🄐' => '(A)',
+  '🄑' => '(B)',
+  '🄒' => '(C)',
+  '🄓' => '(D)',
+  '🄔' => '(E)',
+  '🄕' => '(F)',
+  '🄖' => '(G)',
+  '🄗' => '(H)',
+  '🄘' => '(I)',
+  '🄙' => '(J)',
+  '🄚' => '(K)',
+  '🄛' => '(L)',
+  '🄜' => '(M)',
+  '🄝' => '(N)',
+  '🄞' => '(O)',
+  '🄟' => '(P)',
+  '🄠' => '(Q)',
+  '🄡' => '(R)',
+  '🄢' => '(S)',
+  '🄣' => '(T)',
+  '🄤' => '(U)',
+  '🄥' => '(V)',
+  '🄦' => '(W)',
+  '🄧' => '(X)',
+  '🄨' => '(Y)',
+  '🄩' => '(Z)',
+  '🄪' => '〔S〕',
+  '🄫' => '(C)',
+  '🄬' => '(R)',
+  '🄭' => '(CD)',
+  '🄮' => '(WZ)',
+  '🄰' => 'A',
+  '🄱' => 'B',
+  '🄲' => 'C',
+  '🄳' => 'D',
+  '🄴' => 'E',
+  '🄵' => 'F',
+  '🄶' => 'G',
+  '🄷' => 'H',
+  '🄸' => 'I',
+  '🄹' => 'J',
+  '🄺' => 'K',
+  '🄻' => 'L',
+  '🄼' => 'M',
+  '🄽' => 'N',
+  '🄾' => 'O',
+  '🄿' => 'P',
+  '🅀' => 'Q',
+  '🅁' => 'R',
+  '🅂' => 'S',
+  '🅃' => 'T',
+  '🅄' => 'U',
+  '🅅' => 'V',
+  '🅆' => 'W',
+  '🅇' => 'X',
+  '🅈' => 'Y',
+  '🅉' => 'Z',
+  '🅊' => 'HV',
+  '🅋' => 'MV',
+  '🅌' => 'SD',
+  '🅍' => 'SS',
+  '🅎' => 'PPV',
+  '🅏' => 'WC',
+  '🆐' => 'DJ',
+  '🈀' => 'ほか',
+  '🈁' => 'ココ',
+  '🈂' => 'サ',
+  '🈐' => '手',
+  '🈑' => '字',
+  '🈒' => '双',
+  '🈓' => 'デ',
+  '🈔' => '二',
+  '🈕' => '多',
+  '🈖' => '解',
+  '🈗' => '天',
+  '🈘' => '交',
+  '🈙' => '映',
+  '🈚' => '無',
+  '🈛' => '料',
+  '🈜' => '前',
+  '🈝' => '後',
+  '🈞' => '再',
+  '🈟' => '新',
+  '🈠' => '初',
+  '🈡' => '終',
+  '🈢' => '生',
+  '🈣' => '販',
+  '🈤' => '声',
+  '🈥' => '吹',
+  '🈦' => '演',
+  '🈧' => '投',
+  '🈨' => '捕',
+  '🈩' => '一',
+  '🈪' => '三',
+  '🈫' => '遊',
+  '🈬' => '左',
+  '🈭' => '中',
+  '🈮' => '右',
+  '🈯' => '指',
+  '🈰' => '走',
+  '🈱' => '打',
+  '🈲' => '禁',
+  '🈳' => '空',
+  '🈴' => '合',
+  '🈵' => '満',
+  '🈶' => '有',
+  '🈷' => '月',
+  '🈸' => '申',
+  '🈹' => '割',
+  '🈺' => '営',
+  '🈻' => '配',
+  '🉀' => '〔本〕',
+  '🉁' => '〔三〕',
+  '🉂' => '〔二〕',
+  '🉃' => '〔安〕',
+  '🉄' => '〔点〕',
+  '🉅' => '〔打〕',
+  '🉆' => '〔盗〕',
+  '🉇' => '〔勝〕',
+  '🉈' => '〔敗〕',
+  '🉐' => '(得)',
+  '🉑' => '(可)',
+  '🯰' => '0',
+  '🯱' => '1',
+  '🯲' => '2',
+  '🯳' => '3',
+  '🯴' => '4',
+  '🯵' => '5',
+  '🯶' => '6',
+  '🯷' => '7',
+  '🯸' => '8',
+  '🯹' => '9',
+  '丽' => '丽',
+  '丸' => '丸',
+  '乁' => '乁',
+  '𠄢' => '𠄢',
+  '你' => '你',
+  '侮' => '侮',
+  '侻' => '侻',
+  '倂' => '倂',
+  '偺' => '偺',
+  '備' => '備',
+  '僧' => '僧',
+  '像' => '像',
+  '㒞' => '㒞',
+  '𠘺' => '𠘺',
+  '免' => '免',
+  '兔' => '兔',
+  '兤' => '兤',
+  '具' => '具',
+  '𠔜' => '𠔜',
+  '㒹' => '㒹',
+  '內' => '內',
+  '再' => '再',
+  '𠕋' => '𠕋',
+  '冗' => '冗',
+  '冤' => '冤',
+  '仌' => '仌',
+  '冬' => '冬',
+  '况' => '况',
+  '𩇟' => '𩇟',
+  '凵' => '凵',
+  '刃' => '刃',
+  '㓟' => '㓟',
+  '刻' => '刻',
+  '剆' => '剆',
+  '割' => '割',
+  '剷' => '剷',
+  '㔕' => '㔕',
+  '勇' => '勇',
+  '勉' => '勉',
+  '勤' => '勤',
+  '勺' => '勺',
+  '包' => '包',
+  '匆' => '匆',
+  '北' => '北',
+  '卉' => '卉',
+  '卑' => '卑',
+  '博' => '博',
+  '即' => '即',
+  '卽' => '卽',
+  '卿' => '卿',
+  '卿' => '卿',
+  '卿' => '卿',
+  '𠨬' => '𠨬',
+  '灰' => '灰',
+  '及' => '及',
+  '叟' => '叟',
+  '𠭣' => '𠭣',
+  '叫' => '叫',
+  '叱' => '叱',
+  '吆' => '吆',
+  '咞' => '咞',
+  '吸' => '吸',
+  '呈' => '呈',
+  '周' => '周',
+  '咢' => '咢',
+  '哶' => '哶',
+  '唐' => '唐',
+  '啓' => '啓',
+  '啣' => '啣',
+  '善' => '善',
+  '善' => '善',
+  '喙' => '喙',
+  '喫' => '喫',
+  '喳' => '喳',
+  '嗂' => '嗂',
+  '圖' => '圖',
+  '嘆' => '嘆',
+  '圗' => '圗',
+  '噑' => '噑',
+  '噴' => '噴',
+  '切' => '切',
+  '壮' => '壮',
+  '城' => '城',
+  '埴' => '埴',
+  '堍' => '堍',
+  '型' => '型',
+  '堲' => '堲',
+  '報' => '報',
+  '墬' => '墬',
+  '𡓤' => '𡓤',
+  '売' => '売',
+  '壷' => '壷',
+  '夆' => '夆',
+  '多' => '多',
+  '夢' => '夢',
+  '奢' => '奢',
+  '𡚨' => '𡚨',
+  '𡛪' => '𡛪',
+  '姬' => '姬',
+  '娛' => '娛',
+  '娧' => '娧',
+  '姘' => '姘',
+  '婦' => '婦',
+  '㛮' => '㛮',
+  '㛼' => '㛼',
+  '嬈' => '嬈',
+  '嬾' => '嬾',
+  '嬾' => '嬾',
+  '𡧈' => '𡧈',
+  '寃' => '寃',
+  '寘' => '寘',
+  '寧' => '寧',
+  '寳' => '寳',
+  '𡬘' => '𡬘',
+  '寿' => '寿',
+  '将' => '将',
+  '当' => '当',
+  '尢' => '尢',
+  '㞁' => '㞁',
+  '屠' => '屠',
+  '屮' => '屮',
+  '峀' => '峀',
+  '岍' => '岍',
+  '𡷤' => '𡷤',
+  '嵃' => '嵃',
+  '𡷦' => '𡷦',
+  '嵮' => '嵮',
+  '嵫' => '嵫',
+  '嵼' => '嵼',
+  '巡' => '巡',
+  '巢' => '巢',
+  '㠯' => '㠯',
+  '巽' => '巽',
+  '帨' => '帨',
+  '帽' => '帽',
+  '幩' => '幩',
+  '㡢' => '㡢',
+  '𢆃' => '𢆃',
+  '㡼' => '㡼',
+  '庰' => '庰',
+  '庳' => '庳',
+  '庶' => '庶',
+  '廊' => '廊',
+  '𪎒' => '𪎒',
+  '廾' => '廾',
+  '𢌱' => '𢌱',
+  '𢌱' => '𢌱',
+  '舁' => '舁',
+  '弢' => '弢',
+  '弢' => '弢',
+  '㣇' => '㣇',
+  '𣊸' => '𣊸',
+  '𦇚' => '𦇚',
+  '形' => '形',
+  '彫' => '彫',
+  '㣣' => '㣣',
+  '徚' => '徚',
+  '忍' => '忍',
+  '志' => '志',
+  '忹' => '忹',
+  '悁' => '悁',
+  '㤺' => '㤺',
+  '㤜' => '㤜',
+  '悔' => '悔',
+  '𢛔' => '𢛔',
+  '惇' => '惇',
+  '慈' => '慈',
+  '慌' => '慌',
+  '慎' => '慎',
+  '慌' => '慌',
+  '慺' => '慺',
+  '憎' => '憎',
+  '憲' => '憲',
+  '憤' => '憤',
+  '憯' => '憯',
+  '懞' => '懞',
+  '懲' => '懲',
+  '懶' => '懶',
+  '成' => '成',
+  '戛' => '戛',
+  '扝' => '扝',
+  '抱' => '抱',
+  '拔' => '拔',
+  '捐' => '捐',
+  '𢬌' => '𢬌',
+  '挽' => '挽',
+  '拼' => '拼',
+  '捨' => '捨',
+  '掃' => '掃',
+  '揤' => '揤',
+  '𢯱' => '𢯱',
+  '搢' => '搢',
+  '揅' => '揅',
+  '掩' => '掩',
+  '㨮' => '㨮',
+  '摩' => '摩',
+  '摾' => '摾',
+  '撝' => '撝',
+  '摷' => '摷',
+  '㩬' => '㩬',
+  '敏' => '敏',
+  '敬' => '敬',
+  '𣀊' => '𣀊',
+  '旣' => '旣',
+  '書' => '書',
+  '晉' => '晉',
+  '㬙' => '㬙',
+  '暑' => '暑',
+  '㬈' => '㬈',
+  '㫤' => '㫤',
+  '冒' => '冒',
+  '冕' => '冕',
+  '最' => '最',
+  '暜' => '暜',
+  '肭' => '肭',
+  '䏙' => '䏙',
+  '朗' => '朗',
+  '望' => '望',
+  '朡' => '朡',
+  '杞' => '杞',
+  '杓' => '杓',
+  '𣏃' => '𣏃',
+  '㭉' => '㭉',
+  '柺' => '柺',
+  '枅' => '枅',
+  '桒' => '桒',
+  '梅' => '梅',
+  '𣑭' => '𣑭',
+  '梎' => '梎',
+  '栟' => '栟',
+  '椔' => '椔',
+  '㮝' => '㮝',
+  '楂' => '楂',
+  '榣' => '榣',
+  '槪' => '槪',
+  '檨' => '檨',
+  '𣚣' => '𣚣',
+  '櫛' => '櫛',
+  '㰘' => '㰘',
+  '次' => '次',
+  '𣢧' => '𣢧',
+  '歔' => '歔',
+  '㱎' => '㱎',
+  '歲' => '歲',
+  '殟' => '殟',
+  '殺' => '殺',
+  '殻' => '殻',
+  '𣪍' => '𣪍',
+  '𡴋' => '𡴋',
+  '𣫺' => '𣫺',
+  '汎' => '汎',
+  '𣲼' => '𣲼',
+  '沿' => '沿',
+  '泍' => '泍',
+  '汧' => '汧',
+  '洖' => '洖',
+  '派' => '派',
+  '海' => '海',
+  '流' => '流',
+  '浩' => '浩',
+  '浸' => '浸',
+  '涅' => '涅',
+  '𣴞' => '𣴞',
+  '洴' => '洴',
+  '港' => '港',
+  '湮' => '湮',
+  '㴳' => '㴳',
+  '滋' => '滋',
+  '滇' => '滇',
+  '𣻑' => '𣻑',
+  '淹' => '淹',
+  '潮' => '潮',
+  '𣽞' => '𣽞',
+  '𣾎' => '𣾎',
+  '濆' => '濆',
+  '瀹' => '瀹',
+  '瀞' => '瀞',
+  '瀛' => '瀛',
+  '㶖' => '㶖',
+  '灊' => '灊',
+  '災' => '災',
+  '灷' => '灷',
+  '炭' => '炭',
+  '𠔥' => '𠔥',
+  '煅' => '煅',
+  '𤉣' => '𤉣',
+  '熜' => '熜',
+  '𤎫' => '𤎫',
+  '爨' => '爨',
+  '爵' => '爵',
+  '牐' => '牐',
+  '𤘈' => '𤘈',
+  '犀' => '犀',
+  '犕' => '犕',
+  '𤜵' => '𤜵',
+  '𤠔' => '𤠔',
+  '獺' => '獺',
+  '王' => '王',
+  '㺬' => '㺬',
+  '玥' => '玥',
+  '㺸' => '㺸',
+  '㺸' => '㺸',
+  '瑇' => '瑇',
+  '瑜' => '瑜',
+  '瑱' => '瑱',
+  '璅' => '璅',
+  '瓊' => '瓊',
+  '㼛' => '㼛',
+  '甤' => '甤',
+  '𤰶' => '𤰶',
+  '甾' => '甾',
+  '𤲒' => '𤲒',
+  '異' => '異',
+  '𢆟' => '𢆟',
+  '瘐' => '瘐',
+  '𤾡' => '𤾡',
+  '𤾸' => '𤾸',
+  '𥁄' => '𥁄',
+  '㿼' => '㿼',
+  '䀈' => '䀈',
+  '直' => '直',
+  '𥃳' => '𥃳',
+  '𥃲' => '𥃲',
+  '𥄙' => '𥄙',
+  '𥄳' => '𥄳',
+  '眞' => '眞',
+  '真' => '真',
+  '真' => '真',
+  '睊' => '睊',
+  '䀹' => '䀹',
+  '瞋' => '瞋',
+  '䁆' => '䁆',
+  '䂖' => '䂖',
+  '𥐝' => '𥐝',
+  '硎' => '硎',
+  '碌' => '碌',
+  '磌' => '磌',
+  '䃣' => '䃣',
+  '𥘦' => '𥘦',
+  '祖' => '祖',
+  '𥚚' => '𥚚',
+  '𥛅' => '𥛅',
+  '福' => '福',
+  '秫' => '秫',
+  '䄯' => '䄯',
+  '穀' => '穀',
+  '穊' => '穊',
+  '穏' => '穏',
+  '𥥼' => '𥥼',
+  '𥪧' => '𥪧',
+  '𥪧' => '𥪧',
+  '竮' => '竮',
+  '䈂' => '䈂',
+  '𥮫' => '𥮫',
+  '篆' => '篆',
+  '築' => '築',
+  '䈧' => '䈧',
+  '𥲀' => '𥲀',
+  '糒' => '糒',
+  '䊠' => '䊠',
+  '糨' => '糨',
+  '糣' => '糣',
+  '紀' => '紀',
+  '𥾆' => '𥾆',
+  '絣' => '絣',
+  '䌁' => '䌁',
+  '緇' => '緇',
+  '縂' => '縂',
+  '繅' => '繅',
+  '䌴' => '䌴',
+  '𦈨' => '𦈨',
+  '𦉇' => '𦉇',
+  '䍙' => '䍙',
+  '𦋙' => '𦋙',
+  '罺' => '罺',
+  '𦌾' => '𦌾',
+  '羕' => '羕',
+  '翺' => '翺',
+  '者' => '者',
+  '𦓚' => '𦓚',
+  '𦔣' => '𦔣',
+  '聠' => '聠',
+  '𦖨' => '𦖨',
+  '聰' => '聰',
+  '𣍟' => '𣍟',
+  '䏕' => '䏕',
+  '育' => '育',
+  '脃' => '脃',
+  '䐋' => '䐋',
+  '脾' => '脾',
+  '媵' => '媵',
+  '𦞧' => '𦞧',
+  '𦞵' => '𦞵',
+  '𣎓' => '𣎓',
+  '𣎜' => '𣎜',
+  '舁' => '舁',
+  '舄' => '舄',
+  '辞' => '辞',
+  '䑫' => '䑫',
+  '芑' => '芑',
+  '芋' => '芋',
+  '芝' => '芝',
+  '劳' => '劳',
+  '花' => '花',
+  '芳' => '芳',
+  '芽' => '芽',
+  '苦' => '苦',
+  '𦬼' => '𦬼',
+  '若' => '若',
+  '茝' => '茝',
+  '荣' => '荣',
+  '莭' => '莭',
+  '茣' => '茣',
+  '莽' => '莽',
+  '菧' => '菧',
+  '著' => '著',
+  '荓' => '荓',
+  '菊' => '菊',
+  '菌' => '菌',
+  '菜' => '菜',
+  '𦰶' => '𦰶',
+  '𦵫' => '𦵫',
+  '𦳕' => '𦳕',
+  '䔫' => '䔫',
+  '蓱' => '蓱',
+  '蓳' => '蓳',
+  '蔖' => '蔖',
+  '𧏊' => '𧏊',
+  '蕤' => '蕤',
+  '𦼬' => '𦼬',
+  '䕝' => '䕝',
+  '䕡' => '䕡',
+  '𦾱' => '𦾱',
+  '𧃒' => '𧃒',
+  '䕫' => '䕫',
+  '虐' => '虐',
+  '虜' => '虜',
+  '虧' => '虧',
+  '虩' => '虩',
+  '蚩' => '蚩',
+  '蚈' => '蚈',
+  '蜎' => '蜎',
+  '蛢' => '蛢',
+  '蝹' => '蝹',
+  '蜨' => '蜨',
+  '蝫' => '蝫',
+  '螆' => '螆',
+  '䗗' => '䗗',
+  '蟡' => '蟡',
+  '蠁' => '蠁',
+  '䗹' => '䗹',
+  '衠' => '衠',
+  '衣' => '衣',
+  '𧙧' => '𧙧',
+  '裗' => '裗',
+  '裞' => '裞',
+  '䘵' => '䘵',
+  '裺' => '裺',
+  '㒻' => '㒻',
+  '𧢮' => '𧢮',
+  '𧥦' => '𧥦',
+  '䚾' => '䚾',
+  '䛇' => '䛇',
+  '誠' => '誠',
+  '諭' => '諭',
+  '變' => '變',
+  '豕' => '豕',
+  '𧲨' => '𧲨',
+  '貫' => '貫',
+  '賁' => '賁',
+  '贛' => '贛',
+  '起' => '起',
+  '𧼯' => '𧼯',
+  '𠠄' => '𠠄',
+  '跋' => '跋',
+  '趼' => '趼',
+  '跰' => '跰',
+  '𠣞' => '𠣞',
+  '軔' => '軔',
+  '輸' => '輸',
+  '𨗒' => '𨗒',
+  '𨗭' => '𨗭',
+  '邔' => '邔',
+  '郱' => '郱',
+  '鄑' => '鄑',
+  '𨜮' => '𨜮',
+  '鄛' => '鄛',
+  '鈸' => '鈸',
+  '鋗' => '鋗',
+  '鋘' => '鋘',
+  '鉼' => '鉼',
+  '鏹' => '鏹',
+  '鐕' => '鐕',
+  '𨯺' => '𨯺',
+  '開' => '開',
+  '䦕' => '䦕',
+  '閷' => '閷',
+  '𨵷' => '𨵷',
+  '䧦' => '䧦',
+  '雃' => '雃',
+  '嶲' => '嶲',
+  '霣' => '霣',
+  '𩅅' => '𩅅',
+  '𩈚' => '𩈚',
+  '䩮' => '䩮',
+  '䩶' => '䩶',
+  '韠' => '韠',
+  '𩐊' => '𩐊',
+  '䪲' => '䪲',
+  '𩒖' => '𩒖',
+  '頋' => '頋',
+  '頋' => '頋',
+  '頩' => '頩',
+  '𩖶' => '𩖶',
+  '飢' => '飢',
+  '䬳' => '䬳',
+  '餩' => '餩',
+  '馧' => '馧',
+  '駂' => '駂',
+  '駾' => '駾',
+  '䯎' => '䯎',
+  '𩬰' => '𩬰',
+  '鬒' => '鬒',
+  '鱀' => '鱀',
+  '鳽' => '鳽',
+  '䳎' => '䳎',
+  '䳭' => '䳭',
+  '鵧' => '鵧',
+  '𪃎' => '𪃎',
+  '䳸' => '䳸',
+  '𪄅' => '𪄅',
+  '𪈎' => '𪈎',
+  '𪊑' => '𪊑',
+  '麻' => '麻',
+  '䵖' => '䵖',
+  '黹' => '黹',
+  '黾' => '黾',
+  '鼅' => '鼅',
+  '鼏' => '鼏',
+  '鼖' => '鼖',
+  '鼻' => '鼻',
+  '𪘀' => '𪘀',
+  'Æ' => 'AE',
+  'Ð' => 'D',
+  'Ø' => 'O',
+  'Þ' => 'TH',
+  'ß' => 'ss',
+  'æ' => 'ae',
+  'ð' => 'd',
+  'ø' => 'o',
+  'þ' => 'th',
+  'Đ' => 'D',
+  'đ' => 'd',
+  'Ħ' => 'H',
+  'ħ' => 'h',
+  'ı' => 'i',
+  'ĸ' => 'q',
+  'Ł' => 'L',
+  'ł' => 'l',
+  'Ŋ' => 'N',
+  'ŋ' => 'n',
+  'Œ' => 'OE',
+  'œ' => 'oe',
+  'Ŧ' => 'T',
+  'ŧ' => 't',
+  'ƀ' => 'b',
+  'Ɓ' => 'B',
+  'Ƃ' => 'B',
+  'ƃ' => 'b',
+  'Ƈ' => 'C',
+  'ƈ' => 'c',
+  'Ɖ' => 'D',
+  'Ɗ' => 'D',
+  'Ƌ' => 'D',
+  'ƌ' => 'd',
+  'Ɛ' => 'E',
+  'Ƒ' => 'F',
+  'ƒ' => 'f',
+  'Ɠ' => 'G',
+  'ƕ' => 'hv',
+  'Ɩ' => 'I',
+  'Ɨ' => 'I',
+  'Ƙ' => 'K',
+  'ƙ' => 'k',
+  'ƚ' => 'l',
+  'Ɲ' => 'N',
+  'ƞ' => 'n',
+  'Ƣ' => 'OI',
+  'ƣ' => 'oi',
+  'Ƥ' => 'P',
+  'ƥ' => 'p',
+  'ƫ' => 't',
+  'Ƭ' => 'T',
+  'ƭ' => 't',
+  'Ʈ' => 'T',
+  'Ʋ' => 'V',
+  'Ƴ' => 'Y',
+  'ƴ' => 'y',
+  'Ƶ' => 'Z',
+  'ƶ' => 'z',
+  'Ǥ' => 'G',
+  'ǥ' => 'g',
+  'ȡ' => 'd',
+  'Ȥ' => 'Z',
+  'ȥ' => 'z',
+  'ȴ' => 'l',
+  'ȵ' => 'n',
+  'ȶ' => 't',
+  'ȷ' => 'j',
+  'ȸ' => 'db',
+  'ȹ' => 'qp',
+  'Ⱥ' => 'A',
+  'Ȼ' => 'C',
+  'ȼ' => 'c',
+  'Ƚ' => 'L',
+  'Ⱦ' => 'T',
+  'ȿ' => 's',
+  'ɀ' => 'z',
+  'Ƀ' => 'B',
+  'Ʉ' => 'U',
+  'Ɇ' => 'E',
+  'ɇ' => 'e',
+  'Ɉ' => 'J',
+  'ɉ' => 'j',
+  'Ɍ' => 'R',
+  'ɍ' => 'r',
+  'Ɏ' => 'Y',
+  'ɏ' => 'y',
+  'ɓ' => 'b',
+  'ɕ' => 'c',
+  'ɖ' => 'd',
+  'ɗ' => 'd',
+  'ɛ' => 'e',
+  'ɟ' => 'j',
+  'ɠ' => 'g',
+  'ɡ' => 'g',
+  'ɢ' => 'G',
+  'ɦ' => 'h',
+  'ɧ' => 'h',
+  'ɨ' => 'i',
+  'ɪ' => 'I',
+  'ɫ' => 'l',
+  'ɬ' => 'l',
+  'ɭ' => 'l',
+  'ɱ' => 'm',
+  'ɲ' => 'n',
+  'ɳ' => 'n',
+  'ɴ' => 'N',
+  'ɶ' => 'OE',
+  'ɼ' => 'r',
+  'ɽ' => 'r',
+  'ɾ' => 'r',
+  'ʀ' => 'R',
+  'ʂ' => 's',
+  'ʈ' => 't',
+  'ʉ' => 'u',
+  'ʋ' => 'v',
+  'ʏ' => 'Y',
+  'ʐ' => 'z',
+  'ʑ' => 'z',
+  'ʙ' => 'B',
+  'ʛ' => 'G',
+  'ʜ' => 'H',
+  'ʝ' => 'j',
+  'ʟ' => 'L',
+  'ʠ' => 'q',
+  'ʣ' => 'dz',
+  'ʥ' => 'dz',
+  'ʦ' => 'ts',
+  'ʪ' => 'ls',
+  'ʫ' => 'lz',
+  'ᴀ' => 'A',
+  'ᴁ' => 'AE',
+  'ᴃ' => 'B',
+  'ᴄ' => 'C',
+  'ᴅ' => 'D',
+  'ᴆ' => 'D',
+  'ᴇ' => 'E',
+  'ᴊ' => 'J',
+  'ᴋ' => 'K',
+  'ᴌ' => 'L',
+  'ᴍ' => 'M',
+  'ᴏ' => 'O',
+  'ᴘ' => 'P',
+  'ᴛ' => 'T',
+  'ᴜ' => 'U',
+  'ᴠ' => 'V',
+  'ᴡ' => 'W',
+  'ᴢ' => 'Z',
+  'ᵫ' => 'ue',
+  'ᵬ' => 'b',
+  'ᵭ' => 'd',
+  'ᵮ' => 'f',
+  'ᵯ' => 'm',
+  'ᵰ' => 'n',
+  'ᵱ' => 'p',
+  'ᵲ' => 'r',
+  'ᵳ' => 'r',
+  'ᵴ' => 's',
+  'ᵵ' => 't',
+  'ᵶ' => 'z',
+  'ᵺ' => 'th',
+  'ᵻ' => 'I',
+  'ᵽ' => 'p',
+  'ᵾ' => 'U',
+  'ᶀ' => 'b',
+  'ᶁ' => 'd',
+  'ᶂ' => 'f',
+  'ᶃ' => 'g',
+  'ᶄ' => 'k',
+  'ᶅ' => 'l',
+  'ᶆ' => 'm',
+  'ᶇ' => 'n',
+  'ᶈ' => 'p',
+  'ᶉ' => 'r',
+  'ᶊ' => 's',
+  'ᶌ' => 'v',
+  'ᶍ' => 'x',
+  'ᶎ' => 'z',
+  'ᶏ' => 'a',
+  'ᶑ' => 'd',
+  'ᶒ' => 'e',
+  'ᶓ' => 'e',
+  'ᶖ' => 'i',
+  'ᶙ' => 'u',
+  'ẜ' => 's',
+  'ẝ' => 's',
+  'ẞ' => 'SS',
+  'Ỻ' => 'LL',
+  'ỻ' => 'll',
+  'Ỽ' => 'V',
+  'ỽ' => 'v',
+  'Ỿ' => 'Y',
+  'ỿ' => 'y',
+  'Ⱡ' => 'L',
+  'ⱡ' => 'l',
+  'Ɫ' => 'L',
+  'Ᵽ' => 'P',
+  'Ɽ' => 'R',
+  'ⱥ' => 'a',
+  'ⱦ' => 't',
+  'Ⱨ' => 'H',
+  'ⱨ' => 'h',
+  'Ⱪ' => 'K',
+  'ⱪ' => 'k',
+  'Ⱬ' => 'Z',
+  'ⱬ' => 'z',
+  'Ɱ' => 'M',
+  'ⱱ' => 'v',
+  'Ⱳ' => 'W',
+  'ⱳ' => 'w',
+  'ⱴ' => 'v',
+  'ⱸ' => 'e',
+  'ⱺ' => 'o',
+  'Ȿ' => 'S',
+  'Ɀ' => 'Z',
+  'ꜰ' => 'F',
+  'ꜱ' => 'S',
+  'Ꜳ' => 'AA',
+  'ꜳ' => 'aa',
+  'Ꜵ' => 'AO',
+  'ꜵ' => 'ao',
+  'Ꜷ' => 'AU',
+  'ꜷ' => 'au',
+  'Ꜹ' => 'AV',
+  'ꜹ' => 'av',
+  'Ꜻ' => 'AV',
+  'ꜻ' => 'av',
+  'Ꜽ' => 'AY',
+  'ꜽ' => 'ay',
+  'Ꝁ' => 'K',
+  'ꝁ' => 'k',
+  'Ꝃ' => 'K',
+  'ꝃ' => 'k',
+  'Ꝅ' => 'K',
+  'ꝅ' => 'k',
+  'Ꝇ' => 'L',
+  'ꝇ' => 'l',
+  'Ꝉ' => 'L',
+  'ꝉ' => 'l',
+  'Ꝋ' => 'O',
+  'ꝋ' => 'o',
+  'Ꝍ' => 'O',
+  'ꝍ' => 'o',
+  'Ꝏ' => 'OO',
+  'ꝏ' => 'oo',
+  'Ꝑ' => 'P',
+  'ꝑ' => 'p',
+  'Ꝓ' => 'P',
+  'ꝓ' => 'p',
+  'Ꝕ' => 'P',
+  'ꝕ' => 'p',
+  'Ꝗ' => 'Q',
+  'ꝗ' => 'q',
+  'Ꝙ' => 'Q',
+  'ꝙ' => 'q',
+  'Ꝟ' => 'V',
+  'ꝟ' => 'v',
+  'Ꝡ' => 'VY',
+  'ꝡ' => 'vy',
+  'Ꝥ' => 'TH',
+  'ꝥ' => 'th',
+  'Ꝧ' => 'TH',
+  'ꝧ' => 'th',
+  'ꝱ' => 'd',
+  'ꝲ' => 'l',
+  'ꝳ' => 'm',
+  'ꝴ' => 'n',
+  'ꝵ' => 'r',
+  'ꝶ' => 'R',
+  'ꝷ' => 't',
+  'Ꝺ' => 'D',
+  'ꝺ' => 'd',
+  'Ꝼ' => 'F',
+  'ꝼ' => 'f',
+  'Ꞇ' => 'T',
+  'ꞇ' => 't',
+  'Ꞑ' => 'N',
+  'ꞑ' => 'n',
+  'Ꞓ' => 'C',
+  'ꞓ' => 'c',
+  'Ꞡ' => 'G',
+  'ꞡ' => 'g',
+  'Ꞣ' => 'K',
+  'ꞣ' => 'k',
+  'Ꞥ' => 'N',
+  'ꞥ' => 'n',
+  'Ꞧ' => 'R',
+  'ꞧ' => 'r',
+  'Ꞩ' => 'S',
+  'ꞩ' => 's',
+  'Ɦ' => 'H',
+  '©' => '(C)',
+  '®' => '(R)',
+  '₠' => 'CE',
+  '₢' => 'Cr',
+  '₣' => 'Fr.',
+  '₤' => 'L.',
+  '₧' => 'Pts',
+  '₺' => 'TL',
+  '₹' => 'Rs',
+  '℗' => '(P)',
+  '℘' => 'P',
+  '℞' => 'Rx',
+  '〇' => '0',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  'ʹ' => '\'',
+  'ʺ' => '"',
+  'ʻ' => '\'',
+  'ʼ' => '\'',
+  'ʽ' => '\'',
+  'ˈ' => '\'',
+  'ˋ' => '`',
+  '‘' => '\'',
+  '’' => '\'',
+  '‚' => ',',
+  '‛' => '\'',
+  '“' => '"',
+  '”' => '"',
+  '„' => ',,',
+  '‟' => '"',
+  '′' => '\'',
+  '〝' => '"',
+  '〞' => '"',
+  '«' => '<<',
+  '»' => '>>',
+  '‹' => '<',
+  '›' => '>',
+  '­' => '-',
+  '‐' => '-',
+  '‑' => '-',
+  '‒' => '-',
+  '–' => '-',
+  '—' => '-',
+  '―' => '-',
+  '︱' => '-',
+  '︲' => '-',
+  '˂' => '<',
+  '˃' => '>',
+  '˄' => '^',
+  'ˆ' => '^',
+  'ː' => ':',
+  '˜' => '~',
+  '‖' => '||',
+  '⁄' => '/',
+  '⁅' => '[',
+  '⁆' => ']',
+  '⁎' => '*',
+  '、' => ',',
+  '。' => '.',
+  '〈' => '<',
+  '〉' => '>',
+  '《' => '<<',
+  '》' => '>>',
+  '〔' => '[',
+  '〕' => ']',
+  '〘' => '[',
+  '〙' => ']',
+  '〚' => '[',
+  '〛' => ']',
+  '︐' => ',',
+  '︑' => ',',
+  '︒' => '.',
+  '︓' => ':',
+  '︔' => ';',
+  '︕' => '!',
+  '︖' => '?',
+  '︙' => '...',
+  '︰' => '..',
+  '︵' => '(',
+  '︶' => ')',
+  '︷' => '{',
+  '︸' => '}',
+  '︹' => '[',
+  '︺' => ']',
+  '︽' => '<<',
+  '︾' => '>>',
+  '︿' => '<',
+  '﹀' => '>',
+  '﹇' => '[',
+  '﹈' => ']',
+  '×' => '*',
+  '÷' => '/',
+  '˖' => '+',
+  '˗' => '-',
+  '−' => '-',
+  '∕' => '/',
+  '∖' => '\\',
+  '∣' => '|',
+  '∥' => '||',
+  '≪' => '<<',
+  '≫' => '>>',
+  '⦅' => '((',
+  '⦆' => '))',
+);
diff --git a/lib/symfony/polyfill-iconv/bootstrap.php b/lib/symfony/polyfill-iconv/bootstrap.php
new file mode 100644
index 000000000..6eb76fc5a
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/bootstrap.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Iconv as p;
+
+if (extension_loaded('iconv')) {
+    return;
+}
+
+if (!defined('ICONV_IMPL')) {
+    define('ICONV_IMPL', 'Symfony');
+}
+if (!defined('ICONV_VERSION')) {
+    define('ICONV_VERSION', '1.0');
+}
+if (!defined('ICONV_MIME_DECODE_STRICT')) {
+    define('ICONV_MIME_DECODE_STRICT', 1);
+}
+if (!defined('ICONV_MIME_DECODE_CONTINUE_ON_ERROR')) {
+    define('ICONV_MIME_DECODE_CONTINUE_ON_ERROR', 2);
+}
+
+if (!function_exists('iconv')) {
+    function iconv($from_encoding, $to_encoding, $string) { return p\Iconv::iconv($from_encoding, $to_encoding, $string); }
+}
+if (!function_exists('iconv_get_encoding')) {
+    function iconv_get_encoding($type = 'all') { return p\Iconv::iconv_get_encoding($type); }
+}
+if (!function_exists('iconv_set_encoding')) {
+    function iconv_set_encoding($type, $encoding) { return p\Iconv::iconv_set_encoding($type, $encoding); }
+}
+if (!function_exists('iconv_mime_encode')) {
+    function iconv_mime_encode($field_name, $field_value, $options = null) { return p\Iconv::iconv_mime_encode($field_name, $field_value, $options); }
+}
+if (!function_exists('iconv_mime_decode_headers')) {
+    function iconv_mime_decode_headers($headers, $mode = 0, $encoding = null) { return p\Iconv::iconv_mime_decode_headers($headers, $mode, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    if (!function_exists('iconv_strlen')) {
+        function iconv_strlen($string, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_strlen($string, $encoding); }
+    }
+    if (!function_exists('iconv_strpos')) {
+        function iconv_strpos($haystack, $needle, $offset = 0, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_strpos($haystack, $needle, $offset, $encoding); }
+    }
+    if (!function_exists('iconv_strrpos')) {
+        function iconv_strrpos($haystack, $needle, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_strrpos($haystack, $needle, 0, $encoding); }
+    }
+    if (!function_exists('iconv_substr')) {
+        function iconv_substr($string, $offset, $length = 2147483647, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_substr($string, $offset, $length, $encoding); }
+    }
+    if (!function_exists('iconv_mime_decode')) {
+        function iconv_mime_decode($string, $mode = 0, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_decode_mimeheader($string, $mode, $encoding); }
+    }
+} else {
+    if (!function_exists('iconv_strlen')) {
+        if (extension_loaded('xml')) {
+            function iconv_strlen($string, $encoding = null) { return p\Iconv::strlen1($string, $encoding); }
+        } else {
+            function iconv_strlen($string, $encoding = null) { return p\Iconv::strlen2($string, $encoding); }
+        }
+    }
+
+    if (!function_exists('iconv_strpos')) {
+        function iconv_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Iconv::iconv_strpos($haystack, $needle, $offset, $encoding); }
+    }
+    if (!function_exists('iconv_strrpos')) {
+        function iconv_strrpos($haystack, $needle, $encoding = null) { return p\Iconv::iconv_strrpos($haystack, $needle, $encoding); }
+    }
+    if (!function_exists('iconv_substr')) {
+        function iconv_substr($string, $offset, $length = 2147483647, $encoding = null) { return p\Iconv::iconv_substr($string, $offset, $length, $encoding); }
+    }
+    if (!function_exists('iconv_mime_decode')) {
+        function iconv_mime_decode($string, $mode = 0, $encoding = null) { return p\Iconv::iconv_mime_decode($string, $mode, $encoding); }
+    }
+}
diff --git a/lib/symfony/polyfill-iconv/composer.json b/lib/symfony/polyfill-iconv/composer.json
new file mode 100644
index 000000000..727f74281
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "symfony/polyfill-iconv",
+    "type": "library",
+    "description": "Symfony polyfill for the Iconv extension",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "iconv"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Iconv\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "suggest": {
+        "ext-iconv": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/Idn.php b/lib/symfony/polyfill-intl-idn/Idn.php
new file mode 100644
index 000000000..bccea3ec5
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Idn.php
@@ -0,0 +1,923 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com> and Trevor Rowbotham <trevor.rowbotham@pm.me>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Intl\Idn;
+
+use Exception;
+use Normalizer;
+use Symfony\Polyfill\Intl\Idn\Resources\unidata\DisallowedRanges;
+use Symfony\Polyfill\Intl\Idn\Resources\unidata\Regex;
+
+/**
+ * @see https://www.unicode.org/reports/tr46/
+ *
+ * @internal
+ */
+final class Idn
+{
+    const ERROR_EMPTY_LABEL = 1;
+    const ERROR_LABEL_TOO_LONG = 2;
+    const ERROR_DOMAIN_NAME_TOO_LONG = 4;
+    const ERROR_LEADING_HYPHEN = 8;
+    const ERROR_TRAILING_HYPHEN = 0x10;
+    const ERROR_HYPHEN_3_4 = 0x20;
+    const ERROR_LEADING_COMBINING_MARK = 0x40;
+    const ERROR_DISALLOWED = 0x80;
+    const ERROR_PUNYCODE = 0x100;
+    const ERROR_LABEL_HAS_DOT = 0x200;
+    const ERROR_INVALID_ACE_LABEL = 0x400;
+    const ERROR_BIDI = 0x800;
+    const ERROR_CONTEXTJ = 0x1000;
+    const ERROR_CONTEXTO_PUNCTUATION = 0x2000;
+    const ERROR_CONTEXTO_DIGITS = 0x4000;
+
+    const INTL_IDNA_VARIANT_2003 = 0;
+    const INTL_IDNA_VARIANT_UTS46 = 1;
+
+    const IDNA_DEFAULT = 0;
+    const IDNA_ALLOW_UNASSIGNED = 1;
+    const IDNA_USE_STD3_RULES = 2;
+    const IDNA_CHECK_BIDI = 4;
+    const IDNA_CHECK_CONTEXTJ = 8;
+    const IDNA_NONTRANSITIONAL_TO_ASCII = 16;
+    const IDNA_NONTRANSITIONAL_TO_UNICODE = 32;
+
+    const MAX_DOMAIN_SIZE = 253;
+    const MAX_LABEL_SIZE = 63;
+
+    const BASE = 36;
+    const TMIN = 1;
+    const TMAX = 26;
+    const SKEW = 38;
+    const DAMP = 700;
+    const INITIAL_BIAS = 72;
+    const INITIAL_N = 128;
+    const DELIMITER = '-';
+    const MAX_INT = 2147483647;
+
+    /**
+     * Contains the numeric value of a basic code point (for use in representing integers) in the
+     * range 0 to BASE-1, or -1 if b is does not represent a value.
+     *
+     * @var array<int, int>
+     */
+    private static $basicToDigit = array(
+        -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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, -1,
+
+        -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+
+        -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -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, -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, -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, -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,
+    );
+
+    /**
+     * @var array<int, int>
+     */
+    private static $virama;
+
+    /**
+     * @var array<int, string>
+     */
+    private static $mapped;
+
+    /**
+     * @var array<int, bool>
+     */
+    private static $ignored;
+
+    /**
+     * @var array<int, string>
+     */
+    private static $deviation;
+
+    /**
+     * @var array<int, bool>
+     */
+    private static $disallowed;
+
+    /**
+     * @var array<int, string>
+     */
+    private static $disallowed_STD3_mapped;
+
+    /**
+     * @var array<int, bool>
+     */
+    private static $disallowed_STD3_valid;
+
+    /**
+     * @var bool
+     */
+    private static $mappingTableLoaded = false;
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#ToASCII
+     *
+     * @param string $domainName
+     * @param int    $options
+     * @param int    $variant
+     * @param array  $idna_info
+     *
+     * @return string|false
+     */
+    public static function idn_to_ascii($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
+    {
+        if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
+            @trigger_error('idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
+        }
+
+        $options = array(
+            'CheckHyphens' => true,
+            'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & self::IDNA_CHECK_BIDI),
+            'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & self::IDNA_CHECK_CONTEXTJ),
+            'UseSTD3ASCIIRules' => 0 !== ($options & self::IDNA_USE_STD3_RULES),
+            'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & self::IDNA_NONTRANSITIONAL_TO_ASCII),
+            'VerifyDnsLength' => true,
+        );
+        $info = new Info();
+        $labels = self::process((string) $domainName, $options, $info);
+
+        foreach ($labels as $i => $label) {
+            // Only convert labels to punycode that contain non-ASCII code points
+            if (1 === preg_match('/[^\x00-\x7F]/', $label)) {
+                try {
+                    $label = 'xn--'.self::punycodeEncode($label);
+                } catch (Exception $e) {
+                    $info->errors |= self::ERROR_PUNYCODE;
+                }
+
+                $labels[$i] = $label;
+            }
+        }
+
+        if ($options['VerifyDnsLength']) {
+            self::validateDomainAndLabelLength($labels, $info);
+        }
+
+        $idna_info = array(
+            'result' => implode('.', $labels),
+            'isTransitionalDifferent' => $info->transitionalDifferent,
+            'errors' => $info->errors,
+        );
+
+        return 0 === $info->errors ? $idna_info['result'] : false;
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#ToUnicode
+     *
+     * @param string $domainName
+     * @param int    $options
+     * @param int    $variant
+     * @param array  $idna_info
+     *
+     * @return string|false
+     */
+    public static function idn_to_utf8($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
+    {
+        if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
+            @trigger_error('idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
+        }
+
+        $info = new Info();
+        $labels = self::process((string) $domainName, array(
+            'CheckHyphens' => true,
+            'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & self::IDNA_CHECK_BIDI),
+            'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & self::IDNA_CHECK_CONTEXTJ),
+            'UseSTD3ASCIIRules' => 0 !== ($options & self::IDNA_USE_STD3_RULES),
+            'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & self::IDNA_NONTRANSITIONAL_TO_UNICODE),
+        ), $info);
+        $idna_info = array(
+            'result' => implode('.', $labels),
+            'isTransitionalDifferent' => $info->transitionalDifferent,
+            'errors' => $info->errors,
+        );
+
+        return 0 === $info->errors ? $idna_info['result'] : false;
+    }
+
+    /**
+     * @param string $label
+     *
+     * @return bool
+     */
+    private static function isValidContextJ(array $codePoints, $label)
+    {
+        if (!isset(self::$virama)) {
+            self::$virama = require __DIR__.\DIRECTORY_SEPARATOR.'Resources'.\DIRECTORY_SEPARATOR.'unidata'.\DIRECTORY_SEPARATOR.'virama.php';
+        }
+
+        $offset = 0;
+
+        foreach ($codePoints as $i => $codePoint) {
+            if (0x200C !== $codePoint && 0x200D !== $codePoint) {
+                continue;
+            }
+
+            if (!isset($codePoints[$i - 1])) {
+                return false;
+            }
+
+            // If Canonical_Combining_Class(Before(cp)) .eq. Virama Then True;
+            if (isset(self::$virama[$codePoints[$i - 1]])) {
+                continue;
+            }
+
+            // If RegExpMatch((Joining_Type:{L,D})(Joining_Type:T)*\u200C(Joining_Type:T)*(Joining_Type:{R,D})) Then
+            // True;
+            // Generated RegExp = ([Joining_Type:{L,D}][Joining_Type:T]*\u200C[Joining_Type:T]*)[Joining_Type:{R,D}]
+            if (0x200C === $codePoint && 1 === preg_match(Regex::ZWNJ, $label, $matches, PREG_OFFSET_CAPTURE, $offset)) {
+                $offset += \strlen($matches[1][0]);
+
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#ProcessingStepMap
+     *
+     * @param string              $input
+     * @param array<string, bool> $options
+     *
+     * @return string
+     */
+    private static function mapCodePoints($input, array $options, Info $info)
+    {
+        $str = '';
+        $useSTD3ASCIIRules = $options['UseSTD3ASCIIRules'];
+        $transitional = $options['Transitional_Processing'];
+
+        foreach (self::utf8Decode($input) as $codePoint) {
+            $data = self::lookupCodePointStatus($codePoint, $useSTD3ASCIIRules);
+
+            switch ($data['status']) {
+                case 'disallowed':
+                    $info->errors |= self::ERROR_DISALLOWED;
+
+                    // no break.
+
+                case 'valid':
+                    $str .= mb_chr($codePoint, 'utf-8');
+
+                    break;
+
+                case 'ignored':
+                    // Do nothing.
+                    break;
+
+                case 'mapped':
+                    $str .= $data['mapping'];
+
+                    break;
+
+                case 'deviation':
+                    $info->transitionalDifferent = true;
+                    $str .= ($transitional ? $data['mapping'] : mb_chr($codePoint, 'utf-8'));
+
+                    break;
+            }
+        }
+
+        return $str;
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#Processing
+     *
+     * @param string              $domain
+     * @param array<string, bool> $options
+     *
+     * @return array<int, string>
+     */
+    private static function process($domain, array $options, Info $info)
+    {
+        // If VerifyDnsLength is not set, we are doing ToUnicode otherwise we are doing ToASCII and
+        // we need to respect the VerifyDnsLength option.
+        $checkForEmptyLabels = !isset($options['VerifyDnsLength']) || $options['VerifyDnsLength'];
+
+        if ($checkForEmptyLabels && '' === $domain) {
+            $info->errors |= self::ERROR_EMPTY_LABEL;
+
+            return array($domain);
+        }
+
+        // Step 1. Map each code point in the domain name string
+        $domain = self::mapCodePoints($domain, $options, $info);
+
+        // Step 2. Normalize the domain name string to Unicode Normalization Form C.
+        if (!Normalizer::isNormalized($domain, Normalizer::FORM_C)) {
+            $domain = Normalizer::normalize($domain, Normalizer::FORM_C);
+        }
+
+        // Step 3. Break the string into labels at U+002E (.) FULL STOP.
+        $labels = explode('.', $domain);
+        $lastLabelIndex = \count($labels) - 1;
+
+        // Step 4. Convert and validate each label in the domain name string.
+        foreach ($labels as $i => $label) {
+            $validationOptions = $options;
+
+            if ('xn--' === substr($label, 0, 4)) {
+                try {
+                    $label = self::punycodeDecode(substr($label, 4));
+                } catch (Exception $e) {
+                    $info->errors |= self::ERROR_PUNYCODE;
+
+                    continue;
+                }
+
+                $validationOptions['Transitional_Processing'] = false;
+                $labels[$i] = $label;
+            }
+
+            self::validateLabel($label, $info, $validationOptions, $i > 0 && $i === $lastLabelIndex);
+        }
+
+        if ($info->bidiDomain && !$info->validBidiDomain) {
+            $info->errors |= self::ERROR_BIDI;
+        }
+
+        // Any input domain name string that does not record an error has been successfully
+        // processed according to this specification. Conversely, if an input domain_name string
+        // causes an error, then the processing of the input domain_name string fails. Determining
+        // what to do with error input is up to the caller, and not in the scope of this document.
+        return $labels;
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc5893#section-2
+     *
+     * @param string $label
+     */
+    private static function validateBidiLabel($label, Info $info)
+    {
+        if (1 === preg_match(Regex::RTL_LABEL, $label)) {
+            $info->bidiDomain = true;
+
+            // Step 1. The first character must be a character with Bidi property L, R, or AL.
+            // If it has the R or AL property, it is an RTL label
+            if (1 !== preg_match(Regex::BIDI_STEP_1_RTL, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            // Step 2. In an RTL label, only characters with the Bidi properties R, AL, AN, EN, ES,
+            // CS, ET, ON, BN, or NSM are allowed.
+            if (1 === preg_match(Regex::BIDI_STEP_2, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            // Step 3. In an RTL label, the end of the label must be a character with Bidi property
+            // R, AL, EN, or AN, followed by zero or more characters with Bidi property NSM.
+            if (1 !== preg_match(Regex::BIDI_STEP_3, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            // Step 4. In an RTL label, if an EN is present, no AN may be present, and vice versa.
+            if (1 === preg_match(Regex::BIDI_STEP_4_AN, $label) && 1 === preg_match(Regex::BIDI_STEP_4_EN, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            return;
+        }
+
+        // We are a LTR label
+        // Step 1. The first character must be a character with Bidi property L, R, or AL.
+        // If it has the L property, it is an LTR label.
+        if (1 !== preg_match(Regex::BIDI_STEP_1_LTR, $label)) {
+            $info->validBidiDomain = false;
+
+            return;
+        }
+
+        // Step 5. In an LTR label, only characters with the Bidi properties L, EN,
+        // ES, CS, ET, ON, BN, or NSM are allowed.
+        if (1 === preg_match(Regex::BIDI_STEP_5, $label)) {
+            $info->validBidiDomain = false;
+
+            return;
+        }
+
+        // Step 6.In an LTR label, the end of the label must be a character with Bidi property L or
+        // EN, followed by zero or more characters with Bidi property NSM.
+        if (1 !== preg_match(Regex::BIDI_STEP_6, $label)) {
+            $info->validBidiDomain = false;
+
+            return;
+        }
+    }
+
+    /**
+     * @param array<int, string> $labels
+     */
+    private static function validateDomainAndLabelLength(array $labels, Info $info)
+    {
+        $maxDomainSize = self::MAX_DOMAIN_SIZE;
+        $length = \count($labels);
+
+        // Number of "." delimiters.
+        $domainLength = $length - 1;
+
+        // If the last label is empty and it is not the first label, then it is the root label.
+        // Increase the max size by 1, making it 254, to account for the root label's "."
+        // delimiter. This also means we don't need to check the last label's length for being too
+        // long.
+        if ($length > 1 && '' === $labels[$length - 1]) {
+            ++$maxDomainSize;
+            --$length;
+        }
+
+        for ($i = 0; $i < $length; ++$i) {
+            $bytes = \strlen($labels[$i]);
+            $domainLength += $bytes;
+
+            if ($bytes > self::MAX_LABEL_SIZE) {
+                $info->errors |= self::ERROR_LABEL_TOO_LONG;
+            }
+        }
+
+        if ($domainLength > $maxDomainSize) {
+            $info->errors |= self::ERROR_DOMAIN_NAME_TOO_LONG;
+        }
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#Validity_Criteria
+     *
+     * @param string              $label
+     * @param array<string, bool> $options
+     * @param bool                $canBeEmpty
+     */
+    private static function validateLabel($label, Info $info, array $options, $canBeEmpty)
+    {
+        if ('' === $label) {
+            if (!$canBeEmpty && (!isset($options['VerifyDnsLength']) || $options['VerifyDnsLength'])) {
+                $info->errors |= self::ERROR_EMPTY_LABEL;
+            }
+
+            return;
+        }
+
+        // Step 1. The label must be in Unicode Normalization Form C.
+        if (!Normalizer::isNormalized($label, Normalizer::FORM_C)) {
+            $info->errors |= self::ERROR_INVALID_ACE_LABEL;
+        }
+
+        $codePoints = self::utf8Decode($label);
+
+        if ($options['CheckHyphens']) {
+            // Step 2. If CheckHyphens, the label must not contain a U+002D HYPHEN-MINUS character
+            // in both the thrid and fourth positions.
+            if (isset($codePoints[2], $codePoints[3]) && 0x002D === $codePoints[2] && 0x002D === $codePoints[3]) {
+                $info->errors |= self::ERROR_HYPHEN_3_4;
+            }
+
+            // Step 3. If CheckHyphens, the label must neither begin nor end with a U+002D
+            // HYPHEN-MINUS character.
+            if ('-' === substr($label, 0, 1)) {
+                $info->errors |= self::ERROR_LEADING_HYPHEN;
+            }
+
+            if ('-' === substr($label, -1, 1)) {
+                $info->errors |= self::ERROR_TRAILING_HYPHEN;
+            }
+        }
+
+        // Step 4. The label must not contain a U+002E (.) FULL STOP.
+        if (false !== strpos($label, '.')) {
+            $info->errors |= self::ERROR_LABEL_HAS_DOT;
+        }
+
+        // Step 5. The label must not begin with a combining mark, that is: General_Category=Mark.
+        if (1 === preg_match(Regex::COMBINING_MARK, $label)) {
+            $info->errors |= self::ERROR_LEADING_COMBINING_MARK;
+        }
+
+        // Step 6. Each code point in the label must only have certain status values according to
+        // Section 5, IDNA Mapping Table:
+        $transitional = $options['Transitional_Processing'];
+        $useSTD3ASCIIRules = $options['UseSTD3ASCIIRules'];
+
+        foreach ($codePoints as $codePoint) {
+            $data = self::lookupCodePointStatus($codePoint, $useSTD3ASCIIRules);
+            $status = $data['status'];
+
+            if ('valid' === $status || (!$transitional && 'deviation' === $status)) {
+                continue;
+            }
+
+            $info->errors |= self::ERROR_DISALLOWED;
+
+            break;
+        }
+
+        // Step 7. If CheckJoiners, the label must satisify the ContextJ rules from Appendix A, in
+        // The Unicode Code Points and Internationalized Domain Names for Applications (IDNA)
+        // [IDNA2008].
+        if ($options['CheckJoiners'] && !self::isValidContextJ($codePoints, $label)) {
+            $info->errors |= self::ERROR_CONTEXTJ;
+        }
+
+        // Step 8. If CheckBidi, and if the domain name is a  Bidi domain name, then the label must
+        // satisfy all six of the numbered conditions in [IDNA2008] RFC 5893, Section 2.
+        if ($options['CheckBidi'] && (!$info->bidiDomain || $info->validBidiDomain)) {
+            self::validateBidiLabel($label, $info);
+        }
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc3492#section-6.2
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    private static function punycodeDecode($input)
+    {
+        $n = self::INITIAL_N;
+        $out = 0;
+        $i = 0;
+        $bias = self::INITIAL_BIAS;
+        $lastDelimIndex = strrpos($input, self::DELIMITER);
+        $b = false === $lastDelimIndex ? 0 : $lastDelimIndex;
+        $inputLength = \strlen($input);
+        $output = array();
+        $bytes = array_map('ord', str_split($input));
+
+        for ($j = 0; $j < $b; ++$j) {
+            if ($bytes[$j] > 0x7F) {
+                throw new Exception('Invalid input');
+            }
+
+            $output[$out++] = $input[$j];
+        }
+
+        if ($b > 0) {
+            ++$b;
+        }
+
+        for ($in = $b; $in < $inputLength; ++$out) {
+            $oldi = $i;
+            $w = 1;
+
+            for ($k = self::BASE; /* no condition */; $k += self::BASE) {
+                if ($in >= $inputLength) {
+                    throw new Exception('Invalid input');
+                }
+
+                $digit = self::$basicToDigit[$bytes[$in++] & 0xFF];
+
+                if ($digit < 0) {
+                    throw new Exception('Invalid input');
+                }
+
+                if ($digit > intdiv(self::MAX_INT - $i, $w)) {
+                    throw new Exception('Integer overflow');
+                }
+
+                $i += $digit * $w;
+
+                if ($k <= $bias) {
+                    $t = self::TMIN;
+                } elseif ($k >= $bias + self::TMAX) {
+                    $t = self::TMAX;
+                } else {
+                    $t = $k - $bias;
+                }
+
+                if ($digit < $t) {
+                    break;
+                }
+
+                $baseMinusT = self::BASE - $t;
+
+                if ($w > intdiv(self::MAX_INT, $baseMinusT)) {
+                    throw new Exception('Integer overflow');
+                }
+
+                $w *= $baseMinusT;
+            }
+
+            $outPlusOne = $out + 1;
+            $bias = self::adaptBias($i - $oldi, $outPlusOne, 0 === $oldi);
+
+            if (intdiv($i, $outPlusOne) > self::MAX_INT - $n) {
+                throw new Exception('Integer overflow');
+            }
+
+            $n += intdiv($i, $outPlusOne);
+            $i %= $outPlusOne;
+            array_splice($output, $i++, 0, array(mb_chr($n, 'utf-8')));
+        }
+
+        return implode('', $output);
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc3492#section-6.3
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    private static function punycodeEncode($input)
+    {
+        $n = self::INITIAL_N;
+        $delta = 0;
+        $out = 0;
+        $bias = self::INITIAL_BIAS;
+        $inputLength = 0;
+        $output = '';
+        $iter = self::utf8Decode($input);
+
+        foreach ($iter as $codePoint) {
+            ++$inputLength;
+
+            if ($codePoint < 0x80) {
+                $output .= \chr($codePoint);
+                ++$out;
+            }
+        }
+
+        $h = $out;
+        $b = $out;
+
+        if ($b > 0) {
+            $output .= self::DELIMITER;
+            ++$out;
+        }
+
+        while ($h < $inputLength) {
+            $m = self::MAX_INT;
+
+            foreach ($iter as $codePoint) {
+                if ($codePoint >= $n && $codePoint < $m) {
+                    $m = $codePoint;
+                }
+            }
+
+            if ($m - $n > intdiv(self::MAX_INT - $delta, $h + 1)) {
+                throw new Exception('Integer overflow');
+            }
+
+            $delta += ($m - $n) * ($h + 1);
+            $n = $m;
+
+            foreach ($iter as $codePoint) {
+                if ($codePoint < $n && 0 === ++$delta) {
+                    throw new Exception('Integer overflow');
+                } elseif ($codePoint === $n) {
+                    $q = $delta;
+
+                    for ($k = self::BASE; /* no condition */; $k += self::BASE) {
+                        if ($k <= $bias) {
+                            $t = self::TMIN;
+                        } elseif ($k >= $bias + self::TMAX) {
+                            $t = self::TMAX;
+                        } else {
+                            $t = $k - $bias;
+                        }
+
+                        if ($q < $t) {
+                            break;
+                        }
+
+                        $qMinusT = $q - $t;
+                        $baseMinusT = self::BASE - $t;
+                        $output .= self::encodeDigit($t + ($qMinusT) % ($baseMinusT), false);
+                        ++$out;
+                        $q = intdiv($qMinusT, $baseMinusT);
+                    }
+
+                    $output .= self::encodeDigit($q, false);
+                    ++$out;
+                    $bias = self::adaptBias($delta, $h + 1, $h === $b);
+                    $delta = 0;
+                    ++$h;
+                }
+            }
+
+            ++$delta;
+            ++$n;
+        }
+
+        return $output;
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc3492#section-6.1
+     *
+     * @param int  $delta
+     * @param int  $numPoints
+     * @param bool $firstTime
+     *
+     * @return int
+     */
+    private static function adaptBias($delta, $numPoints, $firstTime)
+    {
+        // xxx >> 1 is a faster way of doing intdiv(xxx, 2)
+        $delta = $firstTime ? intdiv($delta, self::DAMP) : $delta >> 1;
+        $delta += intdiv($delta, $numPoints);
+        $k = 0;
+
+        while ($delta > ((self::BASE - self::TMIN) * self::TMAX) >> 1) {
+            $delta = intdiv($delta, self::BASE - self::TMIN);
+            $k += self::BASE;
+        }
+
+        return $k + intdiv((self::BASE - self::TMIN + 1) * $delta, $delta + self::SKEW);
+    }
+
+    /**
+     * @param int  $d
+     * @param bool $flag
+     *
+     * @return string
+     */
+    private static function encodeDigit($d, $flag)
+    {
+        return \chr($d + 22 + 75 * ($d < 26 ? 1 : 0) - (($flag ? 1 : 0) << 5));
+    }
+
+    /**
+     * Takes a UTF-8 encoded string and converts it into a series of integer code points. Any
+     * invalid byte sequences will be replaced by a U+FFFD replacement code point.
+     *
+     * @see https://encoding.spec.whatwg.org/#utf-8-decoder
+     *
+     * @param string $input
+     *
+     * @return array<int, int>
+     */
+    private static function utf8Decode($input)
+    {
+        $bytesSeen = 0;
+        $bytesNeeded = 0;
+        $lowerBoundary = 0x80;
+        $upperBoundary = 0xBF;
+        $codePoint = 0;
+        $codePoints = array();
+        $length = \strlen($input);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $byte = \ord($input[$i]);
+
+            if (0 === $bytesNeeded) {
+                if ($byte >= 0x00 && $byte <= 0x7F) {
+                    $codePoints[] = $byte;
+
+                    continue;
+                }
+
+                if ($byte >= 0xC2 && $byte <= 0xDF) {
+                    $bytesNeeded = 1;
+                    $codePoint = $byte & 0x1F;
+                } elseif ($byte >= 0xE0 && $byte <= 0xEF) {
+                    if (0xE0 === $byte) {
+                        $lowerBoundary = 0xA0;
+                    } elseif (0xED === $byte) {
+                        $upperBoundary = 0x9F;
+                    }
+
+                    $bytesNeeded = 2;
+                    $codePoint = $byte & 0xF;
+                } elseif ($byte >= 0xF0 && $byte <= 0xF4) {
+                    if (0xF0 === $byte) {
+                        $lowerBoundary = 0x90;
+                    } elseif (0xF4 === $byte) {
+                        $upperBoundary = 0x8F;
+                    }
+
+                    $bytesNeeded = 3;
+                    $codePoint = $byte & 0x7;
+                } else {
+                    $codePoints[] = 0xFFFD;
+                }
+
+                continue;
+            }
+
+            if ($byte < $lowerBoundary || $byte > $upperBoundary) {
+                $codePoint = 0;
+                $bytesNeeded = 0;
+                $bytesSeen = 0;
+                $lowerBoundary = 0x80;
+                $upperBoundary = 0xBF;
+                --$i;
+                $codePoints[] = 0xFFFD;
+
+                continue;
+            }
+
+            $lowerBoundary = 0x80;
+            $upperBoundary = 0xBF;
+            $codePoint = ($codePoint << 6) | ($byte & 0x3F);
+
+            if (++$bytesSeen !== $bytesNeeded) {
+                continue;
+            }
+
+            $codePoints[] = $codePoint;
+            $codePoint = 0;
+            $bytesNeeded = 0;
+            $bytesSeen = 0;
+        }
+
+        // String unexpectedly ended, so append a U+FFFD code point.
+        if (0 !== $bytesNeeded) {
+            $codePoints[] = 0xFFFD;
+        }
+
+        return $codePoints;
+    }
+
+    /**
+     * @param int  $codePoint
+     * @param bool $useSTD3ASCIIRules
+     *
+     * @return array{status: string, mapping?: string}
+     */
+    private static function lookupCodePointStatus($codePoint, $useSTD3ASCIIRules)
+    {
+        if (!self::$mappingTableLoaded) {
+            self::$mappingTableLoaded = true;
+            self::$mapped = require __DIR__.'/Resources/unidata/mapped.php';
+            self::$ignored = require __DIR__.'/Resources/unidata/ignored.php';
+            self::$deviation = require __DIR__.'/Resources/unidata/deviation.php';
+            self::$disallowed = require __DIR__.'/Resources/unidata/disallowed.php';
+            self::$disallowed_STD3_mapped = require __DIR__.'/Resources/unidata/disallowed_STD3_mapped.php';
+            self::$disallowed_STD3_valid = require __DIR__.'/Resources/unidata/disallowed_STD3_valid.php';
+        }
+
+        if (isset(self::$mapped[$codePoint])) {
+            return array('status' => 'mapped', 'mapping' => self::$mapped[$codePoint]);
+        }
+
+        if (isset(self::$ignored[$codePoint])) {
+            return array('status' => 'ignored');
+        }
+
+        if (isset(self::$deviation[$codePoint])) {
+            return array('status' => 'deviation', 'mapping' => self::$deviation[$codePoint]);
+        }
+
+        if (isset(self::$disallowed[$codePoint]) || DisallowedRanges::inRange($codePoint)) {
+            return array('status' => 'disallowed');
+        }
+
+        $isDisallowedMapped = isset(self::$disallowed_STD3_mapped[$codePoint]);
+
+        if ($isDisallowedMapped || isset(self::$disallowed_STD3_valid[$codePoint])) {
+            $status = 'disallowed';
+
+            if (!$useSTD3ASCIIRules) {
+                $status = $isDisallowedMapped ? 'mapped' : 'valid';
+            }
+
+            if ($isDisallowedMapped) {
+                return array('status' => $status, 'mapping' => self::$disallowed_STD3_mapped[$codePoint]);
+            }
+
+            return array('status' => $status);
+        }
+
+        return array('status' => 'valid');
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/Info.php b/lib/symfony/polyfill-intl-idn/Info.php
new file mode 100644
index 000000000..25c3582b2
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Info.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com> and Trevor Rowbotham <trevor.rowbotham@pm.me>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Intl\Idn;
+
+/**
+ * @internal
+ */
+class Info
+{
+    public $bidiDomain = false;
+    public $errors = 0;
+    public $validBidiDomain = true;
+    public $transitionalDifferent = false;
+}
diff --git a/lib/symfony/polyfill-intl-idn/LICENSE b/lib/symfony/polyfill-intl-idn/LICENSE
new file mode 100644
index 000000000..03c5e2577
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-2019 Fabien Potencier and Trevor Rowbotham <trevor.rowbotham@pm.me>
+
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-intl-idn/README.md b/lib/symfony/polyfill-intl-idn/README.md
new file mode 100644
index 000000000..2e75f2e52
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/README.md
@@ -0,0 +1,12 @@
+Symfony Polyfill / Intl: Idn
+============================
+
+This component provides [`idn_to_ascii`](https://php.net/idn-to-ascii) and [`idn_to_utf8`](https://php.net/idn-to-utf8) functions to users who run php versions without the [Intl](https://php.net/intl) extension.
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php
new file mode 100644
index 000000000..5bb70e48a
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php
@@ -0,0 +1,375 @@
+<?php
+
+namespace Symfony\Polyfill\Intl\Idn\Resources\unidata;
+
+/**
+ * @internal
+ */
+final class DisallowedRanges
+{
+    /**
+     * @param int $codePoint
+     *
+     * @return bool
+     */
+    public static function inRange($codePoint)
+    {
+        if ($codePoint >= 128 && $codePoint <= 159) {
+            return true;
+        }
+
+        if ($codePoint >= 2155 && $codePoint <= 2207) {
+            return true;
+        }
+
+        if ($codePoint >= 3676 && $codePoint <= 3712) {
+            return true;
+        }
+
+        if ($codePoint >= 3808 && $codePoint <= 3839) {
+            return true;
+        }
+
+        if ($codePoint >= 4059 && $codePoint <= 4095) {
+            return true;
+        }
+
+        if ($codePoint >= 4256 && $codePoint <= 4293) {
+            return true;
+        }
+
+        if ($codePoint >= 6849 && $codePoint <= 6911) {
+            return true;
+        }
+
+        if ($codePoint >= 11859 && $codePoint <= 11903) {
+            return true;
+        }
+
+        if ($codePoint >= 42955 && $codePoint <= 42996) {
+            return true;
+        }
+
+        if ($codePoint >= 55296 && $codePoint <= 57343) {
+            return true;
+        }
+
+        if ($codePoint >= 57344 && $codePoint <= 63743) {
+            return true;
+        }
+
+        if ($codePoint >= 64218 && $codePoint <= 64255) {
+            return true;
+        }
+
+        if ($codePoint >= 64976 && $codePoint <= 65007) {
+            return true;
+        }
+
+        if ($codePoint >= 65630 && $codePoint <= 65663) {
+            return true;
+        }
+
+        if ($codePoint >= 65953 && $codePoint <= 65999) {
+            return true;
+        }
+
+        if ($codePoint >= 66046 && $codePoint <= 66175) {
+            return true;
+        }
+
+        if ($codePoint >= 66518 && $codePoint <= 66559) {
+            return true;
+        }
+
+        if ($codePoint >= 66928 && $codePoint <= 67071) {
+            return true;
+        }
+
+        if ($codePoint >= 67432 && $codePoint <= 67583) {
+            return true;
+        }
+
+        if ($codePoint >= 67760 && $codePoint <= 67807) {
+            return true;
+        }
+
+        if ($codePoint >= 67904 && $codePoint <= 67967) {
+            return true;
+        }
+
+        if ($codePoint >= 68256 && $codePoint <= 68287) {
+            return true;
+        }
+
+        if ($codePoint >= 68528 && $codePoint <= 68607) {
+            return true;
+        }
+
+        if ($codePoint >= 68681 && $codePoint <= 68735) {
+            return true;
+        }
+
+        if ($codePoint >= 68922 && $codePoint <= 69215) {
+            return true;
+        }
+
+        if ($codePoint >= 69298 && $codePoint <= 69375) {
+            return true;
+        }
+
+        if ($codePoint >= 69466 && $codePoint <= 69551) {
+            return true;
+        }
+
+        if ($codePoint >= 70207 && $codePoint <= 70271) {
+            return true;
+        }
+
+        if ($codePoint >= 70517 && $codePoint <= 70655) {
+            return true;
+        }
+
+        if ($codePoint >= 70874 && $codePoint <= 71039) {
+            return true;
+        }
+
+        if ($codePoint >= 71134 && $codePoint <= 71167) {
+            return true;
+        }
+
+        if ($codePoint >= 71370 && $codePoint <= 71423) {
+            return true;
+        }
+
+        if ($codePoint >= 71488 && $codePoint <= 71679) {
+            return true;
+        }
+
+        if ($codePoint >= 71740 && $codePoint <= 71839) {
+            return true;
+        }
+
+        if ($codePoint >= 72026 && $codePoint <= 72095) {
+            return true;
+        }
+
+        if ($codePoint >= 72441 && $codePoint <= 72703) {
+            return true;
+        }
+
+        if ($codePoint >= 72887 && $codePoint <= 72959) {
+            return true;
+        }
+
+        if ($codePoint >= 73130 && $codePoint <= 73439) {
+            return true;
+        }
+
+        if ($codePoint >= 73465 && $codePoint <= 73647) {
+            return true;
+        }
+
+        if ($codePoint >= 74650 && $codePoint <= 74751) {
+            return true;
+        }
+
+        if ($codePoint >= 75076 && $codePoint <= 77823) {
+            return true;
+        }
+
+        if ($codePoint >= 78905 && $codePoint <= 82943) {
+            return true;
+        }
+
+        if ($codePoint >= 83527 && $codePoint <= 92159) {
+            return true;
+        }
+
+        if ($codePoint >= 92784 && $codePoint <= 92879) {
+            return true;
+        }
+
+        if ($codePoint >= 93072 && $codePoint <= 93759) {
+            return true;
+        }
+
+        if ($codePoint >= 93851 && $codePoint <= 93951) {
+            return true;
+        }
+
+        if ($codePoint >= 94112 && $codePoint <= 94175) {
+            return true;
+        }
+
+        if ($codePoint >= 101590 && $codePoint <= 101631) {
+            return true;
+        }
+
+        if ($codePoint >= 101641 && $codePoint <= 110591) {
+            return true;
+        }
+
+        if ($codePoint >= 110879 && $codePoint <= 110927) {
+            return true;
+        }
+
+        if ($codePoint >= 111356 && $codePoint <= 113663) {
+            return true;
+        }
+
+        if ($codePoint >= 113828 && $codePoint <= 118783) {
+            return true;
+        }
+
+        if ($codePoint >= 119366 && $codePoint <= 119519) {
+            return true;
+        }
+
+        if ($codePoint >= 119673 && $codePoint <= 119807) {
+            return true;
+        }
+
+        if ($codePoint >= 121520 && $codePoint <= 122879) {
+            return true;
+        }
+
+        if ($codePoint >= 122923 && $codePoint <= 123135) {
+            return true;
+        }
+
+        if ($codePoint >= 123216 && $codePoint <= 123583) {
+            return true;
+        }
+
+        if ($codePoint >= 123648 && $codePoint <= 124927) {
+            return true;
+        }
+
+        if ($codePoint >= 125143 && $codePoint <= 125183) {
+            return true;
+        }
+
+        if ($codePoint >= 125280 && $codePoint <= 126064) {
+            return true;
+        }
+
+        if ($codePoint >= 126133 && $codePoint <= 126208) {
+            return true;
+        }
+
+        if ($codePoint >= 126270 && $codePoint <= 126463) {
+            return true;
+        }
+
+        if ($codePoint >= 126652 && $codePoint <= 126703) {
+            return true;
+        }
+
+        if ($codePoint >= 126706 && $codePoint <= 126975) {
+            return true;
+        }
+
+        if ($codePoint >= 127406 && $codePoint <= 127461) {
+            return true;
+        }
+
+        if ($codePoint >= 127590 && $codePoint <= 127743) {
+            return true;
+        }
+
+        if ($codePoint >= 129202 && $codePoint <= 129279) {
+            return true;
+        }
+
+        if ($codePoint >= 129751 && $codePoint <= 129791) {
+            return true;
+        }
+
+        if ($codePoint >= 129995 && $codePoint <= 130031) {
+            return true;
+        }
+
+        if ($codePoint >= 130042 && $codePoint <= 131069) {
+            return true;
+        }
+
+        if ($codePoint >= 173790 && $codePoint <= 173823) {
+            return true;
+        }
+
+        if ($codePoint >= 191457 && $codePoint <= 194559) {
+            return true;
+        }
+
+        if ($codePoint >= 195102 && $codePoint <= 196605) {
+            return true;
+        }
+
+        if ($codePoint >= 201547 && $codePoint <= 262141) {
+            return true;
+        }
+
+        if ($codePoint >= 262144 && $codePoint <= 327677) {
+            return true;
+        }
+
+        if ($codePoint >= 327680 && $codePoint <= 393213) {
+            return true;
+        }
+
+        if ($codePoint >= 393216 && $codePoint <= 458749) {
+            return true;
+        }
+
+        if ($codePoint >= 458752 && $codePoint <= 524285) {
+            return true;
+        }
+
+        if ($codePoint >= 524288 && $codePoint <= 589821) {
+            return true;
+        }
+
+        if ($codePoint >= 589824 && $codePoint <= 655357) {
+            return true;
+        }
+
+        if ($codePoint >= 655360 && $codePoint <= 720893) {
+            return true;
+        }
+
+        if ($codePoint >= 720896 && $codePoint <= 786429) {
+            return true;
+        }
+
+        if ($codePoint >= 786432 && $codePoint <= 851965) {
+            return true;
+        }
+
+        if ($codePoint >= 851968 && $codePoint <= 917501) {
+            return true;
+        }
+
+        if ($codePoint >= 917536 && $codePoint <= 917631) {
+            return true;
+        }
+
+        if ($codePoint >= 917632 && $codePoint <= 917759) {
+            return true;
+        }
+
+        if ($codePoint >= 918000 && $codePoint <= 983037) {
+            return true;
+        }
+
+        if ($codePoint >= 983040 && $codePoint <= 1048573) {
+            return true;
+        }
+
+        if ($codePoint >= 1048576 && $codePoint <= 1114109) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php
new file mode 100644
index 000000000..5c1c51dde
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Polyfill\Intl\Idn\Resources\unidata;
+
+/**
+ * @internal
+ */
+final class Regex
+{
+    const COMBINING_MARK = '/^[\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{0903}\x{093A}\x{093B}\x{093C}\x{093E}-\x{0940}\x{0941}-\x{0948}\x{0949}-\x{094C}\x{094D}\x{094E}-\x{094F}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{0982}-\x{0983}\x{09BC}\x{09BE}-\x{09C0}\x{09C1}-\x{09C4}\x{09C7}-\x{09C8}\x{09CB}-\x{09CC}\x{09CD}\x{09D7}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A03}\x{0A3C}\x{0A3E}-\x{0A40}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0A83}\x{0ABC}\x{0ABE}-\x{0AC0}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0AC9}\x{0ACB}-\x{0ACC}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B02}-\x{0B03}\x{0B3C}\x{0B3E}\x{0B3F}\x{0B40}\x{0B41}-\x{0B44}\x{0B47}-\x{0B48}\x{0B4B}-\x{0B4C}\x{0B4D}\x{0B55}-\x{0B56}\x{0B57}\x{0B62}-\x{0B63}\x{0B82}\x{0BBE}-\x{0BBF}\x{0BC0}\x{0BC1}-\x{0BC2}\x{0BC6}-\x{0BC8}\x{0BCA}-\x{0BCC}\x{0BCD}\x{0BD7}\x{0C00}\x{0C01}-\x{0C03}\x{0C04}\x{0C3E}-\x{0C40}\x{0C41}-\x{0C44}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0C82}-\x{0C83}\x{0CBC}\x{0CBE}\x{0CBF}\x{0CC0}-\x{0CC4}\x{0CC6}\x{0CC7}-\x{0CC8}\x{0CCA}-\x{0CCB}\x{0CCC}-\x{0CCD}\x{0CD5}-\x{0CD6}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D02}-\x{0D03}\x{0D3B}-\x{0D3C}\x{0D3E}-\x{0D40}\x{0D41}-\x{0D44}\x{0D46}-\x{0D48}\x{0D4A}-\x{0D4C}\x{0D4D}\x{0D57}\x{0D62}-\x{0D63}\x{0D81}\x{0D82}-\x{0D83}\x{0DCA}\x{0DCF}-\x{0DD1}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0DD8}-\x{0DDF}\x{0DF2}-\x{0DF3}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3E}-\x{0F3F}\x{0F71}-\x{0F7E}\x{0F7F}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102B}-\x{102C}\x{102D}-\x{1030}\x{1031}\x{1032}-\x{1037}\x{1038}\x{1039}-\x{103A}\x{103B}-\x{103C}\x{103D}-\x{103E}\x{1056}-\x{1057}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106D}\x{1071}-\x{1074}\x{1082}\x{1083}-\x{1084}\x{1085}-\x{1086}\x{1087}-\x{108C}\x{108D}\x{108F}\x{109A}-\x{109C}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B6}\x{17B7}-\x{17BD}\x{17BE}-\x{17C5}\x{17C6}\x{17C7}-\x{17C8}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1923}-\x{1926}\x{1927}-\x{1928}\x{1929}-\x{192B}\x{1930}-\x{1931}\x{1932}\x{1933}-\x{1938}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A19}-\x{1A1A}\x{1A1B}\x{1A55}\x{1A56}\x{1A57}\x{1A58}-\x{1A5E}\x{1A60}\x{1A61}\x{1A62}\x{1A63}-\x{1A64}\x{1A65}-\x{1A6C}\x{1A6D}-\x{1A72}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B04}\x{1B34}\x{1B35}\x{1B36}-\x{1B3A}\x{1B3B}\x{1B3C}\x{1B3D}-\x{1B41}\x{1B42}\x{1B43}-\x{1B44}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1B82}\x{1BA1}\x{1BA2}-\x{1BA5}\x{1BA6}-\x{1BA7}\x{1BA8}-\x{1BA9}\x{1BAA}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE7}\x{1BE8}-\x{1BE9}\x{1BEA}-\x{1BEC}\x{1BED}\x{1BEE}\x{1BEF}-\x{1BF1}\x{1BF2}-\x{1BF3}\x{1C24}-\x{1C2B}\x{1C2C}-\x{1C33}\x{1C34}-\x{1C35}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE1}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF7}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{302E}-\x{302F}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A823}-\x{A824}\x{A825}-\x{A826}\x{A827}\x{A82C}\x{A880}-\x{A881}\x{A8B4}-\x{A8C3}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A952}-\x{A953}\x{A980}-\x{A982}\x{A983}\x{A9B3}\x{A9B4}-\x{A9B5}\x{A9B6}-\x{A9B9}\x{A9BA}-\x{A9BB}\x{A9BC}-\x{A9BD}\x{A9BE}-\x{A9C0}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA2F}-\x{AA30}\x{AA31}-\x{AA32}\x{AA33}-\x{AA34}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA4D}\x{AA7B}\x{AA7C}\x{AA7D}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEB}\x{AAEC}-\x{AAED}\x{AAEE}-\x{AAEF}\x{AAF5}\x{AAF6}\x{ABE3}-\x{ABE4}\x{ABE5}\x{ABE6}-\x{ABE7}\x{ABE8}\x{ABE9}-\x{ABEA}\x{ABEC}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11000}\x{11001}\x{11002}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{11082}\x{110B0}-\x{110B2}\x{110B3}-\x{110B6}\x{110B7}-\x{110B8}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112C}\x{1112D}-\x{11134}\x{11145}-\x{11146}\x{11173}\x{11180}-\x{11181}\x{11182}\x{111B3}-\x{111B5}\x{111B6}-\x{111BE}\x{111BF}-\x{111C0}\x{111C9}-\x{111CC}\x{111CE}\x{111CF}\x{1122C}-\x{1122E}\x{1122F}-\x{11231}\x{11232}-\x{11233}\x{11234}\x{11235}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E0}-\x{112E2}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{11302}-\x{11303}\x{1133B}-\x{1133C}\x{1133E}-\x{1133F}\x{11340}\x{11341}-\x{11344}\x{11347}-\x{11348}\x{1134B}-\x{1134D}\x{11357}\x{11362}-\x{11363}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11435}-\x{11437}\x{11438}-\x{1143F}\x{11440}-\x{11441}\x{11442}-\x{11444}\x{11445}\x{11446}\x{1145E}\x{114B0}-\x{114B2}\x{114B3}-\x{114B8}\x{114B9}\x{114BA}\x{114BB}-\x{114BE}\x{114BF}-\x{114C0}\x{114C1}\x{114C2}-\x{114C3}\x{115AF}-\x{115B1}\x{115B2}-\x{115B5}\x{115B8}-\x{115BB}\x{115BC}-\x{115BD}\x{115BE}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11630}-\x{11632}\x{11633}-\x{1163A}\x{1163B}-\x{1163C}\x{1163D}\x{1163E}\x{1163F}-\x{11640}\x{116AB}\x{116AC}\x{116AD}\x{116AE}-\x{116AF}\x{116B0}-\x{116B5}\x{116B6}\x{116B7}\x{1171D}-\x{1171F}\x{11720}-\x{11721}\x{11722}-\x{11725}\x{11726}\x{11727}-\x{1172B}\x{1182C}-\x{1182E}\x{1182F}-\x{11837}\x{11838}\x{11839}-\x{1183A}\x{11930}-\x{11935}\x{11937}-\x{11938}\x{1193B}-\x{1193C}\x{1193D}\x{1193E}\x{11940}\x{11942}\x{11943}\x{119D1}-\x{119D3}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119DC}-\x{119DF}\x{119E0}\x{119E4}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A39}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A57}-\x{11A58}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A97}\x{11A98}-\x{11A99}\x{11C2F}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3E}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CA9}\x{11CAA}-\x{11CB0}\x{11CB1}\x{11CB2}-\x{11CB3}\x{11CB4}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D8A}-\x{11D8E}\x{11D90}-\x{11D91}\x{11D93}-\x{11D94}\x{11D95}\x{11D96}\x{11D97}\x{11EF3}-\x{11EF4}\x{11EF5}-\x{11EF6}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F51}-\x{16F87}\x{16F8F}-\x{16F92}\x{16FE4}\x{16FF0}-\x{16FF1}\x{1BC9D}-\x{1BC9E}\x{1D165}-\x{1D166}\x{1D167}-\x{1D169}\x{1D16D}-\x{1D172}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{E0100}-\x{E01EF}]/u';
+
+    const RTL_LABEL = '/[\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06DD}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08E2}\x{200F}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}]/u';
+
+    const BIDI_STEP_1_LTR = '/^[^\x{0000}-\x{0008}\x{0009}\x{000A}\x{000B}\x{000C}\x{000D}\x{000E}-\x{001B}\x{001C}-\x{001E}\x{001F}\x{0020}\x{0021}-\x{0022}\x{0023}\x{0024}\x{0025}\x{0026}-\x{0027}\x{0028}\x{0029}\x{002A}\x{002B}\x{002C}\x{002D}\x{002E}-\x{002F}\x{0030}-\x{0039}\x{003A}\x{003B}\x{003C}-\x{003E}\x{003F}-\x{0040}\x{005B}\x{005C}\x{005D}\x{005E}\x{005F}\x{0060}\x{007B}\x{007C}\x{007D}\x{007E}\x{007F}-\x{0084}\x{0085}\x{0086}-\x{009F}\x{00A0}\x{00A1}\x{00A2}-\x{00A5}\x{00A6}\x{00A7}\x{00A8}\x{00A9}\x{00AB}\x{00AC}\x{00AD}\x{00AE}\x{00AF}\x{00B0}\x{00B1}\x{00B2}-\x{00B3}\x{00B4}\x{00B6}-\x{00B7}\x{00B8}\x{00B9}\x{00BB}\x{00BC}-\x{00BE}\x{00BF}\x{00D7}\x{00F7}\x{02B9}-\x{02BA}\x{02C2}-\x{02C5}\x{02C6}-\x{02CF}\x{02D2}-\x{02DF}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037E}\x{0384}-\x{0385}\x{0387}\x{03F6}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{058A}\x{058D}-\x{058E}\x{058F}\x{0590}\x{0591}-\x{05BD}\x{05BE}\x{05BF}\x{05C0}\x{05C1}-\x{05C2}\x{05C3}\x{05C4}-\x{05C5}\x{05C6}\x{05C7}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0606}-\x{0607}\x{0608}\x{0609}-\x{060A}\x{060B}\x{060C}\x{060D}\x{060E}-\x{060F}\x{0610}-\x{061A}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{064B}-\x{065F}\x{0660}-\x{0669}\x{066A}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0670}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06D6}-\x{06DC}\x{06DD}\x{06DE}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06E9}\x{06EA}-\x{06ED}\x{06EE}-\x{06EF}\x{06F0}-\x{06F9}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0711}\x{0712}-\x{072F}\x{0730}-\x{074A}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07A6}-\x{07B0}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07F6}\x{07F7}-\x{07F9}\x{07FA}\x{07FB}-\x{07FC}\x{07FD}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{0859}-\x{085B}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09F2}-\x{09F3}\x{09FB}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AF1}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0BF3}-\x{0BF8}\x{0BF9}\x{0BFA}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C78}-\x{0C7E}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E3F}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3A}\x{0F3B}\x{0F3C}\x{0F3D}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1390}-\x{1399}\x{1400}\x{1680}\x{169B}\x{169C}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DB}\x{17DD}\x{17F0}-\x{17F9}\x{1800}-\x{1805}\x{1806}\x{1807}-\x{180A}\x{180B}-\x{180D}\x{180E}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1940}\x{1944}-\x{1945}\x{19DE}-\x{19FF}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{2000}-\x{200A}\x{200B}-\x{200D}\x{200F}\x{2010}-\x{2015}\x{2016}-\x{2017}\x{2018}\x{2019}\x{201A}\x{201B}-\x{201C}\x{201D}\x{201E}\x{201F}\x{2020}-\x{2027}\x{2028}\x{2029}\x{202A}\x{202B}\x{202C}\x{202D}\x{202E}\x{202F}\x{2030}-\x{2034}\x{2035}-\x{2038}\x{2039}\x{203A}\x{203B}-\x{203E}\x{203F}-\x{2040}\x{2041}-\x{2043}\x{2044}\x{2045}\x{2046}\x{2047}-\x{2051}\x{2052}\x{2053}\x{2054}\x{2055}-\x{205E}\x{205F}\x{2060}-\x{2064}\x{2065}\x{2066}\x{2067}\x{2068}\x{2069}\x{206A}-\x{206F}\x{2070}\x{2074}-\x{2079}\x{207A}-\x{207B}\x{207C}\x{207D}\x{207E}\x{2080}-\x{2089}\x{208A}-\x{208B}\x{208C}\x{208D}\x{208E}\x{20A0}-\x{20BF}\x{20C0}-\x{20CF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}\x{2116}-\x{2117}\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}\x{214B}\x{214C}-\x{214D}\x{2150}-\x{215F}\x{2189}\x{218A}-\x{218B}\x{2190}-\x{2194}\x{2195}-\x{2199}\x{219A}-\x{219B}\x{219C}-\x{219F}\x{21A0}\x{21A1}-\x{21A2}\x{21A3}\x{21A4}-\x{21A5}\x{21A6}\x{21A7}-\x{21AD}\x{21AE}\x{21AF}-\x{21CD}\x{21CE}-\x{21CF}\x{21D0}-\x{21D1}\x{21D2}\x{21D3}\x{21D4}\x{21D5}-\x{21F3}\x{21F4}-\x{2211}\x{2212}\x{2213}\x{2214}-\x{22FF}\x{2300}-\x{2307}\x{2308}\x{2309}\x{230A}\x{230B}\x{230C}-\x{231F}\x{2320}-\x{2321}\x{2322}-\x{2328}\x{2329}\x{232A}\x{232B}-\x{2335}\x{237B}\x{237C}\x{237D}-\x{2394}\x{2396}-\x{239A}\x{239B}-\x{23B3}\x{23B4}-\x{23DB}\x{23DC}-\x{23E1}\x{23E2}-\x{2426}\x{2440}-\x{244A}\x{2460}-\x{2487}\x{2488}-\x{249B}\x{24EA}-\x{24FF}\x{2500}-\x{25B6}\x{25B7}\x{25B8}-\x{25C0}\x{25C1}\x{25C2}-\x{25F7}\x{25F8}-\x{25FF}\x{2600}-\x{266E}\x{266F}\x{2670}-\x{26AB}\x{26AD}-\x{2767}\x{2768}\x{2769}\x{276A}\x{276B}\x{276C}\x{276D}\x{276E}\x{276F}\x{2770}\x{2771}\x{2772}\x{2773}\x{2774}\x{2775}\x{2776}-\x{2793}\x{2794}-\x{27BF}\x{27C0}-\x{27C4}\x{27C5}\x{27C6}\x{27C7}-\x{27E5}\x{27E6}\x{27E7}\x{27E8}\x{27E9}\x{27EA}\x{27EB}\x{27EC}\x{27ED}\x{27EE}\x{27EF}\x{27F0}-\x{27FF}\x{2900}-\x{2982}\x{2983}\x{2984}\x{2985}\x{2986}\x{2987}\x{2988}\x{2989}\x{298A}\x{298B}\x{298C}\x{298D}\x{298E}\x{298F}\x{2990}\x{2991}\x{2992}\x{2993}\x{2994}\x{2995}\x{2996}\x{2997}\x{2998}\x{2999}-\x{29D7}\x{29D8}\x{29D9}\x{29DA}\x{29DB}\x{29DC}-\x{29FB}\x{29FC}\x{29FD}\x{29FE}-\x{2AFF}\x{2B00}-\x{2B2F}\x{2B30}-\x{2B44}\x{2B45}-\x{2B46}\x{2B47}-\x{2B4C}\x{2B4D}-\x{2B73}\x{2B76}-\x{2B95}\x{2B97}-\x{2BFF}\x{2CE5}-\x{2CEA}\x{2CEF}-\x{2CF1}\x{2CF9}-\x{2CFC}\x{2CFD}\x{2CFE}-\x{2CFF}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E00}-\x{2E01}\x{2E02}\x{2E03}\x{2E04}\x{2E05}\x{2E06}-\x{2E08}\x{2E09}\x{2E0A}\x{2E0B}\x{2E0C}\x{2E0D}\x{2E0E}-\x{2E16}\x{2E17}\x{2E18}-\x{2E19}\x{2E1A}\x{2E1B}\x{2E1C}\x{2E1D}\x{2E1E}-\x{2E1F}\x{2E20}\x{2E21}\x{2E22}\x{2E23}\x{2E24}\x{2E25}\x{2E26}\x{2E27}\x{2E28}\x{2E29}\x{2E2A}-\x{2E2E}\x{2E2F}\x{2E30}-\x{2E39}\x{2E3A}-\x{2E3B}\x{2E3C}-\x{2E3F}\x{2E40}\x{2E41}\x{2E42}\x{2E43}-\x{2E4F}\x{2E50}-\x{2E51}\x{2E52}\x{2E80}-\x{2E99}\x{2E9B}-\x{2EF3}\x{2F00}-\x{2FD5}\x{2FF0}-\x{2FFB}\x{3000}\x{3001}-\x{3003}\x{3004}\x{3008}\x{3009}\x{300A}\x{300B}\x{300C}\x{300D}\x{300E}\x{300F}\x{3010}\x{3011}\x{3012}-\x{3013}\x{3014}\x{3015}\x{3016}\x{3017}\x{3018}\x{3019}\x{301A}\x{301B}\x{301C}\x{301D}\x{301E}-\x{301F}\x{3020}\x{302A}-\x{302D}\x{3030}\x{3036}-\x{3037}\x{303D}\x{303E}-\x{303F}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{31C0}-\x{31E3}\x{321D}-\x{321E}\x{3250}\x{3251}-\x{325F}\x{327C}-\x{327E}\x{32B1}-\x{32BF}\x{32CC}-\x{32CF}\x{3377}-\x{337A}\x{33DE}-\x{33DF}\x{33FF}\x{4DC0}-\x{4DFF}\x{A490}-\x{A4C6}\x{A60D}-\x{A60F}\x{A66F}\x{A670}-\x{A672}\x{A673}\x{A674}-\x{A67D}\x{A67E}\x{A67F}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A788}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A828}-\x{A82B}\x{A82C}\x{A838}\x{A839}\x{A874}-\x{A877}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{AB6A}-\x{AB6B}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1D}\x{FB1E}\x{FB1F}-\x{FB28}\x{FB29}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD3E}\x{FD3F}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDD0}-\x{FDEF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFD}\x{FDFE}-\x{FDFF}\x{FE00}-\x{FE0F}\x{FE10}-\x{FE16}\x{FE17}\x{FE18}\x{FE19}\x{FE20}-\x{FE2F}\x{FE30}\x{FE31}-\x{FE32}\x{FE33}-\x{FE34}\x{FE35}\x{FE36}\x{FE37}\x{FE38}\x{FE39}\x{FE3A}\x{FE3B}\x{FE3C}\x{FE3D}\x{FE3E}\x{FE3F}\x{FE40}\x{FE41}\x{FE42}\x{FE43}\x{FE44}\x{FE45}-\x{FE46}\x{FE47}\x{FE48}\x{FE49}-\x{FE4C}\x{FE4D}-\x{FE4F}\x{FE50}\x{FE51}\x{FE52}\x{FE54}\x{FE55}\x{FE56}-\x{FE57}\x{FE58}\x{FE59}\x{FE5A}\x{FE5B}\x{FE5C}\x{FE5D}\x{FE5E}\x{FE5F}\x{FE60}-\x{FE61}\x{FE62}\x{FE63}\x{FE64}-\x{FE66}\x{FE68}\x{FE69}\x{FE6A}\x{FE6B}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FEFF}\x{FF01}-\x{FF02}\x{FF03}\x{FF04}\x{FF05}\x{FF06}-\x{FF07}\x{FF08}\x{FF09}\x{FF0A}\x{FF0B}\x{FF0C}\x{FF0D}\x{FF0E}-\x{FF0F}\x{FF10}-\x{FF19}\x{FF1A}\x{FF1B}\x{FF1C}-\x{FF1E}\x{FF1F}-\x{FF20}\x{FF3B}\x{FF3C}\x{FF3D}\x{FF3E}\x{FF3F}\x{FF40}\x{FF5B}\x{FF5C}\x{FF5D}\x{FF5E}\x{FF5F}\x{FF60}\x{FF61}\x{FF62}\x{FF63}\x{FF64}-\x{FF65}\x{FFE0}-\x{FFE1}\x{FFE2}\x{FFE3}\x{FFE4}\x{FFE5}-\x{FFE6}\x{FFE8}\x{FFE9}-\x{FFEC}\x{FFED}-\x{FFEE}\x{FFF0}-\x{FFF8}\x{FFF9}-\x{FFFB}\x{FFFC}-\x{FFFD}\x{FFFE}-\x{FFFF}\x{10101}\x{10140}-\x{10174}\x{10175}-\x{10178}\x{10179}-\x{10189}\x{1018A}-\x{1018B}\x{1018C}\x{10190}-\x{1019C}\x{101A0}\x{101FD}\x{102E0}\x{102E1}-\x{102FB}\x{10376}-\x{1037A}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{1091F}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A01}-\x{10A03}\x{10A04}\x{10A05}-\x{10A06}\x{10A07}-\x{10A0B}\x{10A0C}-\x{10A0F}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A38}-\x{10A3A}\x{10A3B}-\x{10A3E}\x{10A3F}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE5}-\x{10AE6}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B39}-\x{10B3F}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D24}-\x{10D27}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAB}-\x{10EAC}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F46}-\x{10F50}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{11001}\x{11038}-\x{11046}\x{11052}-\x{11065}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{11660}-\x{1166C}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{11FD5}-\x{11FDC}\x{11FDD}-\x{11FE0}\x{11FE1}-\x{11FF1}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE2}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D200}-\x{1D241}\x{1D242}-\x{1D244}\x{1D245}\x{1D300}-\x{1D356}\x{1D6DB}\x{1D715}\x{1D74F}\x{1D789}\x{1D7C3}\x{1D7CE}-\x{1D7FF}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E2FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D0}-\x{1E8D6}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E944}-\x{1E94A}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF0}-\x{1EEF1}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F000}-\x{1F02B}\x{1F030}-\x{1F093}\x{1F0A0}-\x{1F0AE}\x{1F0B1}-\x{1F0BF}\x{1F0C1}-\x{1F0CF}\x{1F0D1}-\x{1F0F5}\x{1F100}-\x{1F10A}\x{1F10B}-\x{1F10C}\x{1F10D}-\x{1F10F}\x{1F12F}\x{1F16A}-\x{1F16F}\x{1F1AD}\x{1F260}-\x{1F265}\x{1F300}-\x{1F3FA}\x{1F3FB}-\x{1F3FF}\x{1F400}-\x{1F6D7}\x{1F6E0}-\x{1F6EC}\x{1F6F0}-\x{1F6FC}\x{1F700}-\x{1F773}\x{1F780}-\x{1F7D8}\x{1F7E0}-\x{1F7EB}\x{1F800}-\x{1F80B}\x{1F810}-\x{1F847}\x{1F850}-\x{1F859}\x{1F860}-\x{1F887}\x{1F890}-\x{1F8AD}\x{1F8B0}-\x{1F8B1}\x{1F900}-\x{1F978}\x{1F97A}-\x{1F9CB}\x{1F9CD}-\x{1FA53}\x{1FA60}-\x{1FA6D}\x{1FA70}-\x{1FA74}\x{1FA78}-\x{1FA7A}\x{1FA80}-\x{1FA86}\x{1FA90}-\x{1FAA8}\x{1FAB0}-\x{1FAB6}\x{1FAC0}-\x{1FAC2}\x{1FAD0}-\x{1FAD6}\x{1FB00}-\x{1FB92}\x{1FB94}-\x{1FBCA}\x{1FBF0}-\x{1FBF9}\x{1FFFE}-\x{1FFFF}\x{2FFFE}-\x{2FFFF}\x{3FFFE}-\x{3FFFF}\x{4FFFE}-\x{4FFFF}\x{5FFFE}-\x{5FFFF}\x{6FFFE}-\x{6FFFF}\x{7FFFE}-\x{7FFFF}\x{8FFFE}-\x{8FFFF}\x{9FFFE}-\x{9FFFF}\x{AFFFE}-\x{AFFFF}\x{BFFFE}-\x{BFFFF}\x{CFFFE}-\x{CFFFF}\x{DFFFE}-\x{E0000}\x{E0001}\x{E0002}-\x{E001F}\x{E0020}-\x{E007F}\x{E0080}-\x{E00FF}\x{E0100}-\x{E01EF}\x{E01F0}-\x{E0FFF}\x{EFFFE}-\x{EFFFF}\x{FFFFE}-\x{FFFFF}\x{10FFFE}-\x{10FFFF}]/u';
+    const BIDI_STEP_1_RTL = '/^[\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{200F}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}]/u';
+    const BIDI_STEP_2 = '/[^\x{0000}-\x{0008}\x{000E}-\x{001B}\x{0021}-\x{0022}\x{0023}\x{0024}\x{0025}\x{0026}-\x{0027}\x{0028}\x{0029}\x{002A}\x{002B}\x{002C}\x{002D}\x{002E}-\x{002F}\x{0030}-\x{0039}\x{003A}\x{003B}\x{003C}-\x{003E}\x{003F}-\x{0040}\x{005B}\x{005C}\x{005D}\x{005E}\x{005F}\x{0060}\x{007B}\x{007C}\x{007D}\x{007E}\x{007F}-\x{0084}\x{0086}-\x{009F}\x{00A0}\x{00A1}\x{00A2}-\x{00A5}\x{00A6}\x{00A7}\x{00A8}\x{00A9}\x{00AB}\x{00AC}\x{00AD}\x{00AE}\x{00AF}\x{00B0}\x{00B1}\x{00B2}-\x{00B3}\x{00B4}\x{00B6}-\x{00B7}\x{00B8}\x{00B9}\x{00BB}\x{00BC}-\x{00BE}\x{00BF}\x{00D7}\x{00F7}\x{02B9}-\x{02BA}\x{02C2}-\x{02C5}\x{02C6}-\x{02CF}\x{02D2}-\x{02DF}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037E}\x{0384}-\x{0385}\x{0387}\x{03F6}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{058A}\x{058D}-\x{058E}\x{058F}\x{0590}\x{0591}-\x{05BD}\x{05BE}\x{05BF}\x{05C0}\x{05C1}-\x{05C2}\x{05C3}\x{05C4}-\x{05C5}\x{05C6}\x{05C7}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0606}-\x{0607}\x{0608}\x{0609}-\x{060A}\x{060B}\x{060C}\x{060D}\x{060E}-\x{060F}\x{0610}-\x{061A}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{064B}-\x{065F}\x{0660}-\x{0669}\x{066A}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0670}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06D6}-\x{06DC}\x{06DD}\x{06DE}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06E9}\x{06EA}-\x{06ED}\x{06EE}-\x{06EF}\x{06F0}-\x{06F9}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0711}\x{0712}-\x{072F}\x{0730}-\x{074A}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07A6}-\x{07B0}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07F6}\x{07F7}-\x{07F9}\x{07FA}\x{07FB}-\x{07FC}\x{07FD}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{0859}-\x{085B}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09F2}-\x{09F3}\x{09FB}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AF1}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0BF3}-\x{0BF8}\x{0BF9}\x{0BFA}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C78}-\x{0C7E}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E3F}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3A}\x{0F3B}\x{0F3C}\x{0F3D}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1390}-\x{1399}\x{1400}\x{169B}\x{169C}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DB}\x{17DD}\x{17F0}-\x{17F9}\x{1800}-\x{1805}\x{1806}\x{1807}-\x{180A}\x{180B}-\x{180D}\x{180E}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1940}\x{1944}-\x{1945}\x{19DE}-\x{19FF}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{200B}-\x{200D}\x{200F}\x{2010}-\x{2015}\x{2016}-\x{2017}\x{2018}\x{2019}\x{201A}\x{201B}-\x{201C}\x{201D}\x{201E}\x{201F}\x{2020}-\x{2027}\x{202F}\x{2030}-\x{2034}\x{2035}-\x{2038}\x{2039}\x{203A}\x{203B}-\x{203E}\x{203F}-\x{2040}\x{2041}-\x{2043}\x{2044}\x{2045}\x{2046}\x{2047}-\x{2051}\x{2052}\x{2053}\x{2054}\x{2055}-\x{205E}\x{2060}-\x{2064}\x{2065}\x{206A}-\x{206F}\x{2070}\x{2074}-\x{2079}\x{207A}-\x{207B}\x{207C}\x{207D}\x{207E}\x{2080}-\x{2089}\x{208A}-\x{208B}\x{208C}\x{208D}\x{208E}\x{20A0}-\x{20BF}\x{20C0}-\x{20CF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}\x{2116}-\x{2117}\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}\x{214B}\x{214C}-\x{214D}\x{2150}-\x{215F}\x{2189}\x{218A}-\x{218B}\x{2190}-\x{2194}\x{2195}-\x{2199}\x{219A}-\x{219B}\x{219C}-\x{219F}\x{21A0}\x{21A1}-\x{21A2}\x{21A3}\x{21A4}-\x{21A5}\x{21A6}\x{21A7}-\x{21AD}\x{21AE}\x{21AF}-\x{21CD}\x{21CE}-\x{21CF}\x{21D0}-\x{21D1}\x{21D2}\x{21D3}\x{21D4}\x{21D5}-\x{21F3}\x{21F4}-\x{2211}\x{2212}\x{2213}\x{2214}-\x{22FF}\x{2300}-\x{2307}\x{2308}\x{2309}\x{230A}\x{230B}\x{230C}-\x{231F}\x{2320}-\x{2321}\x{2322}-\x{2328}\x{2329}\x{232A}\x{232B}-\x{2335}\x{237B}\x{237C}\x{237D}-\x{2394}\x{2396}-\x{239A}\x{239B}-\x{23B3}\x{23B4}-\x{23DB}\x{23DC}-\x{23E1}\x{23E2}-\x{2426}\x{2440}-\x{244A}\x{2460}-\x{2487}\x{2488}-\x{249B}\x{24EA}-\x{24FF}\x{2500}-\x{25B6}\x{25B7}\x{25B8}-\x{25C0}\x{25C1}\x{25C2}-\x{25F7}\x{25F8}-\x{25FF}\x{2600}-\x{266E}\x{266F}\x{2670}-\x{26AB}\x{26AD}-\x{2767}\x{2768}\x{2769}\x{276A}\x{276B}\x{276C}\x{276D}\x{276E}\x{276F}\x{2770}\x{2771}\x{2772}\x{2773}\x{2774}\x{2775}\x{2776}-\x{2793}\x{2794}-\x{27BF}\x{27C0}-\x{27C4}\x{27C5}\x{27C6}\x{27C7}-\x{27E5}\x{27E6}\x{27E7}\x{27E8}\x{27E9}\x{27EA}\x{27EB}\x{27EC}\x{27ED}\x{27EE}\x{27EF}\x{27F0}-\x{27FF}\x{2900}-\x{2982}\x{2983}\x{2984}\x{2985}\x{2986}\x{2987}\x{2988}\x{2989}\x{298A}\x{298B}\x{298C}\x{298D}\x{298E}\x{298F}\x{2990}\x{2991}\x{2992}\x{2993}\x{2994}\x{2995}\x{2996}\x{2997}\x{2998}\x{2999}-\x{29D7}\x{29D8}\x{29D9}\x{29DA}\x{29DB}\x{29DC}-\x{29FB}\x{29FC}\x{29FD}\x{29FE}-\x{2AFF}\x{2B00}-\x{2B2F}\x{2B30}-\x{2B44}\x{2B45}-\x{2B46}\x{2B47}-\x{2B4C}\x{2B4D}-\x{2B73}\x{2B76}-\x{2B95}\x{2B97}-\x{2BFF}\x{2CE5}-\x{2CEA}\x{2CEF}-\x{2CF1}\x{2CF9}-\x{2CFC}\x{2CFD}\x{2CFE}-\x{2CFF}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E00}-\x{2E01}\x{2E02}\x{2E03}\x{2E04}\x{2E05}\x{2E06}-\x{2E08}\x{2E09}\x{2E0A}\x{2E0B}\x{2E0C}\x{2E0D}\x{2E0E}-\x{2E16}\x{2E17}\x{2E18}-\x{2E19}\x{2E1A}\x{2E1B}\x{2E1C}\x{2E1D}\x{2E1E}-\x{2E1F}\x{2E20}\x{2E21}\x{2E22}\x{2E23}\x{2E24}\x{2E25}\x{2E26}\x{2E27}\x{2E28}\x{2E29}\x{2E2A}-\x{2E2E}\x{2E2F}\x{2E30}-\x{2E39}\x{2E3A}-\x{2E3B}\x{2E3C}-\x{2E3F}\x{2E40}\x{2E41}\x{2E42}\x{2E43}-\x{2E4F}\x{2E50}-\x{2E51}\x{2E52}\x{2E80}-\x{2E99}\x{2E9B}-\x{2EF3}\x{2F00}-\x{2FD5}\x{2FF0}-\x{2FFB}\x{3001}-\x{3003}\x{3004}\x{3008}\x{3009}\x{300A}\x{300B}\x{300C}\x{300D}\x{300E}\x{300F}\x{3010}\x{3011}\x{3012}-\x{3013}\x{3014}\x{3015}\x{3016}\x{3017}\x{3018}\x{3019}\x{301A}\x{301B}\x{301C}\x{301D}\x{301E}-\x{301F}\x{3020}\x{302A}-\x{302D}\x{3030}\x{3036}-\x{3037}\x{303D}\x{303E}-\x{303F}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{31C0}-\x{31E3}\x{321D}-\x{321E}\x{3250}\x{3251}-\x{325F}\x{327C}-\x{327E}\x{32B1}-\x{32BF}\x{32CC}-\x{32CF}\x{3377}-\x{337A}\x{33DE}-\x{33DF}\x{33FF}\x{4DC0}-\x{4DFF}\x{A490}-\x{A4C6}\x{A60D}-\x{A60F}\x{A66F}\x{A670}-\x{A672}\x{A673}\x{A674}-\x{A67D}\x{A67E}\x{A67F}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A788}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A828}-\x{A82B}\x{A82C}\x{A838}\x{A839}\x{A874}-\x{A877}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{AB6A}-\x{AB6B}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1D}\x{FB1E}\x{FB1F}-\x{FB28}\x{FB29}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD3E}\x{FD3F}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDD0}-\x{FDEF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFD}\x{FDFE}-\x{FDFF}\x{FE00}-\x{FE0F}\x{FE10}-\x{FE16}\x{FE17}\x{FE18}\x{FE19}\x{FE20}-\x{FE2F}\x{FE30}\x{FE31}-\x{FE32}\x{FE33}-\x{FE34}\x{FE35}\x{FE36}\x{FE37}\x{FE38}\x{FE39}\x{FE3A}\x{FE3B}\x{FE3C}\x{FE3D}\x{FE3E}\x{FE3F}\x{FE40}\x{FE41}\x{FE42}\x{FE43}\x{FE44}\x{FE45}-\x{FE46}\x{FE47}\x{FE48}\x{FE49}-\x{FE4C}\x{FE4D}-\x{FE4F}\x{FE50}\x{FE51}\x{FE52}\x{FE54}\x{FE55}\x{FE56}-\x{FE57}\x{FE58}\x{FE59}\x{FE5A}\x{FE5B}\x{FE5C}\x{FE5D}\x{FE5E}\x{FE5F}\x{FE60}-\x{FE61}\x{FE62}\x{FE63}\x{FE64}-\x{FE66}\x{FE68}\x{FE69}\x{FE6A}\x{FE6B}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FEFF}\x{FF01}-\x{FF02}\x{FF03}\x{FF04}\x{FF05}\x{FF06}-\x{FF07}\x{FF08}\x{FF09}\x{FF0A}\x{FF0B}\x{FF0C}\x{FF0D}\x{FF0E}-\x{FF0F}\x{FF10}-\x{FF19}\x{FF1A}\x{FF1B}\x{FF1C}-\x{FF1E}\x{FF1F}-\x{FF20}\x{FF3B}\x{FF3C}\x{FF3D}\x{FF3E}\x{FF3F}\x{FF40}\x{FF5B}\x{FF5C}\x{FF5D}\x{FF5E}\x{FF5F}\x{FF60}\x{FF61}\x{FF62}\x{FF63}\x{FF64}-\x{FF65}\x{FFE0}-\x{FFE1}\x{FFE2}\x{FFE3}\x{FFE4}\x{FFE5}-\x{FFE6}\x{FFE8}\x{FFE9}-\x{FFEC}\x{FFED}-\x{FFEE}\x{FFF0}-\x{FFF8}\x{FFF9}-\x{FFFB}\x{FFFC}-\x{FFFD}\x{FFFE}-\x{FFFF}\x{10101}\x{10140}-\x{10174}\x{10175}-\x{10178}\x{10179}-\x{10189}\x{1018A}-\x{1018B}\x{1018C}\x{10190}-\x{1019C}\x{101A0}\x{101FD}\x{102E0}\x{102E1}-\x{102FB}\x{10376}-\x{1037A}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{1091F}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A01}-\x{10A03}\x{10A04}\x{10A05}-\x{10A06}\x{10A07}-\x{10A0B}\x{10A0C}-\x{10A0F}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A38}-\x{10A3A}\x{10A3B}-\x{10A3E}\x{10A3F}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE5}-\x{10AE6}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B39}-\x{10B3F}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D24}-\x{10D27}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAB}-\x{10EAC}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F46}-\x{10F50}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{11001}\x{11038}-\x{11046}\x{11052}-\x{11065}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{11660}-\x{1166C}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{11FD5}-\x{11FDC}\x{11FDD}-\x{11FE0}\x{11FE1}-\x{11FF1}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE2}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D200}-\x{1D241}\x{1D242}-\x{1D244}\x{1D245}\x{1D300}-\x{1D356}\x{1D6DB}\x{1D715}\x{1D74F}\x{1D789}\x{1D7C3}\x{1D7CE}-\x{1D7FF}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E2FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D0}-\x{1E8D6}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E944}-\x{1E94A}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF0}-\x{1EEF1}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F000}-\x{1F02B}\x{1F030}-\x{1F093}\x{1F0A0}-\x{1F0AE}\x{1F0B1}-\x{1F0BF}\x{1F0C1}-\x{1F0CF}\x{1F0D1}-\x{1F0F5}\x{1F100}-\x{1F10A}\x{1F10B}-\x{1F10C}\x{1F10D}-\x{1F10F}\x{1F12F}\x{1F16A}-\x{1F16F}\x{1F1AD}\x{1F260}-\x{1F265}\x{1F300}-\x{1F3FA}\x{1F3FB}-\x{1F3FF}\x{1F400}-\x{1F6D7}\x{1F6E0}-\x{1F6EC}\x{1F6F0}-\x{1F6FC}\x{1F700}-\x{1F773}\x{1F780}-\x{1F7D8}\x{1F7E0}-\x{1F7EB}\x{1F800}-\x{1F80B}\x{1F810}-\x{1F847}\x{1F850}-\x{1F859}\x{1F860}-\x{1F887}\x{1F890}-\x{1F8AD}\x{1F8B0}-\x{1F8B1}\x{1F900}-\x{1F978}\x{1F97A}-\x{1F9CB}\x{1F9CD}-\x{1FA53}\x{1FA60}-\x{1FA6D}\x{1FA70}-\x{1FA74}\x{1FA78}-\x{1FA7A}\x{1FA80}-\x{1FA86}\x{1FA90}-\x{1FAA8}\x{1FAB0}-\x{1FAB6}\x{1FAC0}-\x{1FAC2}\x{1FAD0}-\x{1FAD6}\x{1FB00}-\x{1FB92}\x{1FB94}-\x{1FBCA}\x{1FBF0}-\x{1FBF9}\x{1FFFE}-\x{1FFFF}\x{2FFFE}-\x{2FFFF}\x{3FFFE}-\x{3FFFF}\x{4FFFE}-\x{4FFFF}\x{5FFFE}-\x{5FFFF}\x{6FFFE}-\x{6FFFF}\x{7FFFE}-\x{7FFFF}\x{8FFFE}-\x{8FFFF}\x{9FFFE}-\x{9FFFF}\x{AFFFE}-\x{AFFFF}\x{BFFFE}-\x{BFFFF}\x{CFFFE}-\x{CFFFF}\x{DFFFE}-\x{E0000}\x{E0001}\x{E0002}-\x{E001F}\x{E0020}-\x{E007F}\x{E0080}-\x{E00FF}\x{E0100}-\x{E01EF}\x{E01F0}-\x{E0FFF}\x{EFFFE}-\x{EFFFF}\x{FFFFE}-\x{FFFFF}\x{10FFFE}-\x{10FFFF}]/u';
+    const BIDI_STEP_3 = '/[\x{0030}-\x{0039}\x{00B2}-\x{00B3}\x{00B9}\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06DD}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06F0}-\x{06F9}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08E2}\x{200F}\x{2070}\x{2074}-\x{2079}\x{2080}-\x{2089}\x{2488}-\x{249B}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FF10}-\x{FF19}\x{102E1}-\x{102FB}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1D7CE}-\x{1D7FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F100}-\x{1F10A}\x{1FBF0}-\x{1FBF9}][\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1D167}-\x{1D169}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{E0100}-\x{E01EF}]*$/u';
+    const BIDI_STEP_4_AN = '/[\x{0600}-\x{0605}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{06DD}\x{08E2}\x{10D30}-\x{10D39}\x{10E60}-\x{10E7E}]/u';
+    const BIDI_STEP_4_EN = '/[\x{0030}-\x{0039}\x{00B2}-\x{00B3}\x{00B9}\x{06F0}-\x{06F9}\x{2070}\x{2074}-\x{2079}\x{2080}-\x{2089}\x{2488}-\x{249B}\x{FF10}-\x{FF19}\x{102E1}-\x{102FB}\x{1D7CE}-\x{1D7FF}\x{1F100}-\x{1F10A}\x{1FBF0}-\x{1FBF9}]/u';
+    const BIDI_STEP_5 = '/[\x{0009}\x{000A}\x{000B}\x{000C}\x{000D}\x{001C}-\x{001E}\x{001F}\x{0020}\x{0085}\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06DD}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08E2}\x{1680}\x{2000}-\x{200A}\x{200F}\x{2028}\x{2029}\x{202A}\x{202B}\x{202C}\x{202D}\x{202E}\x{205F}\x{2066}\x{2067}\x{2068}\x{2069}\x{3000}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}]/u';
+    const BIDI_STEP_6 = '/[^\x{0000}-\x{0008}\x{0009}\x{000A}\x{000B}\x{000C}\x{000D}\x{000E}-\x{001B}\x{001C}-\x{001E}\x{001F}\x{0020}\x{0021}-\x{0022}\x{0023}\x{0024}\x{0025}\x{0026}-\x{0027}\x{0028}\x{0029}\x{002A}\x{002B}\x{002C}\x{002D}\x{002E}-\x{002F}\x{003A}\x{003B}\x{003C}-\x{003E}\x{003F}-\x{0040}\x{005B}\x{005C}\x{005D}\x{005E}\x{005F}\x{0060}\x{007B}\x{007C}\x{007D}\x{007E}\x{007F}-\x{0084}\x{0085}\x{0086}-\x{009F}\x{00A0}\x{00A1}\x{00A2}-\x{00A5}\x{00A6}\x{00A7}\x{00A8}\x{00A9}\x{00AB}\x{00AC}\x{00AD}\x{00AE}\x{00AF}\x{00B0}\x{00B1}\x{00B4}\x{00B6}-\x{00B7}\x{00B8}\x{00BB}\x{00BC}-\x{00BE}\x{00BF}\x{00D7}\x{00F7}\x{02B9}-\x{02BA}\x{02C2}-\x{02C5}\x{02C6}-\x{02CF}\x{02D2}-\x{02DF}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037E}\x{0384}-\x{0385}\x{0387}\x{03F6}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{058A}\x{058D}-\x{058E}\x{058F}\x{0590}\x{0591}-\x{05BD}\x{05BE}\x{05BF}\x{05C0}\x{05C1}-\x{05C2}\x{05C3}\x{05C4}-\x{05C5}\x{05C6}\x{05C7}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0606}-\x{0607}\x{0608}\x{0609}-\x{060A}\x{060B}\x{060C}\x{060D}\x{060E}-\x{060F}\x{0610}-\x{061A}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{064B}-\x{065F}\x{0660}-\x{0669}\x{066A}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0670}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06D6}-\x{06DC}\x{06DD}\x{06DE}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06E9}\x{06EA}-\x{06ED}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0711}\x{0712}-\x{072F}\x{0730}-\x{074A}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07A6}-\x{07B0}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07F6}\x{07F7}-\x{07F9}\x{07FA}\x{07FB}-\x{07FC}\x{07FD}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{0859}-\x{085B}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09F2}-\x{09F3}\x{09FB}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AF1}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0BF3}-\x{0BF8}\x{0BF9}\x{0BFA}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C78}-\x{0C7E}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E3F}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3A}\x{0F3B}\x{0F3C}\x{0F3D}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1390}-\x{1399}\x{1400}\x{1680}\x{169B}\x{169C}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DB}\x{17DD}\x{17F0}-\x{17F9}\x{1800}-\x{1805}\x{1806}\x{1807}-\x{180A}\x{180B}-\x{180D}\x{180E}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1940}\x{1944}-\x{1945}\x{19DE}-\x{19FF}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{2000}-\x{200A}\x{200B}-\x{200D}\x{200F}\x{2010}-\x{2015}\x{2016}-\x{2017}\x{2018}\x{2019}\x{201A}\x{201B}-\x{201C}\x{201D}\x{201E}\x{201F}\x{2020}-\x{2027}\x{2028}\x{2029}\x{202A}\x{202B}\x{202C}\x{202D}\x{202E}\x{202F}\x{2030}-\x{2034}\x{2035}-\x{2038}\x{2039}\x{203A}\x{203B}-\x{203E}\x{203F}-\x{2040}\x{2041}-\x{2043}\x{2044}\x{2045}\x{2046}\x{2047}-\x{2051}\x{2052}\x{2053}\x{2054}\x{2055}-\x{205E}\x{205F}\x{2060}-\x{2064}\x{2065}\x{2066}\x{2067}\x{2068}\x{2069}\x{206A}-\x{206F}\x{207A}-\x{207B}\x{207C}\x{207D}\x{207E}\x{208A}-\x{208B}\x{208C}\x{208D}\x{208E}\x{20A0}-\x{20BF}\x{20C0}-\x{20CF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}\x{2116}-\x{2117}\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}\x{214B}\x{214C}-\x{214D}\x{2150}-\x{215F}\x{2189}\x{218A}-\x{218B}\x{2190}-\x{2194}\x{2195}-\x{2199}\x{219A}-\x{219B}\x{219C}-\x{219F}\x{21A0}\x{21A1}-\x{21A2}\x{21A3}\x{21A4}-\x{21A5}\x{21A6}\x{21A7}-\x{21AD}\x{21AE}\x{21AF}-\x{21CD}\x{21CE}-\x{21CF}\x{21D0}-\x{21D1}\x{21D2}\x{21D3}\x{21D4}\x{21D5}-\x{21F3}\x{21F4}-\x{2211}\x{2212}\x{2213}\x{2214}-\x{22FF}\x{2300}-\x{2307}\x{2308}\x{2309}\x{230A}\x{230B}\x{230C}-\x{231F}\x{2320}-\x{2321}\x{2322}-\x{2328}\x{2329}\x{232A}\x{232B}-\x{2335}\x{237B}\x{237C}\x{237D}-\x{2394}\x{2396}-\x{239A}\x{239B}-\x{23B3}\x{23B4}-\x{23DB}\x{23DC}-\x{23E1}\x{23E2}-\x{2426}\x{2440}-\x{244A}\x{2460}-\x{2487}\x{24EA}-\x{24FF}\x{2500}-\x{25B6}\x{25B7}\x{25B8}-\x{25C0}\x{25C1}\x{25C2}-\x{25F7}\x{25F8}-\x{25FF}\x{2600}-\x{266E}\x{266F}\x{2670}-\x{26AB}\x{26AD}-\x{2767}\x{2768}\x{2769}\x{276A}\x{276B}\x{276C}\x{276D}\x{276E}\x{276F}\x{2770}\x{2771}\x{2772}\x{2773}\x{2774}\x{2775}\x{2776}-\x{2793}\x{2794}-\x{27BF}\x{27C0}-\x{27C4}\x{27C5}\x{27C6}\x{27C7}-\x{27E5}\x{27E6}\x{27E7}\x{27E8}\x{27E9}\x{27EA}\x{27EB}\x{27EC}\x{27ED}\x{27EE}\x{27EF}\x{27F0}-\x{27FF}\x{2900}-\x{2982}\x{2983}\x{2984}\x{2985}\x{2986}\x{2987}\x{2988}\x{2989}\x{298A}\x{298B}\x{298C}\x{298D}\x{298E}\x{298F}\x{2990}\x{2991}\x{2992}\x{2993}\x{2994}\x{2995}\x{2996}\x{2997}\x{2998}\x{2999}-\x{29D7}\x{29D8}\x{29D9}\x{29DA}\x{29DB}\x{29DC}-\x{29FB}\x{29FC}\x{29FD}\x{29FE}-\x{2AFF}\x{2B00}-\x{2B2F}\x{2B30}-\x{2B44}\x{2B45}-\x{2B46}\x{2B47}-\x{2B4C}\x{2B4D}-\x{2B73}\x{2B76}-\x{2B95}\x{2B97}-\x{2BFF}\x{2CE5}-\x{2CEA}\x{2CEF}-\x{2CF1}\x{2CF9}-\x{2CFC}\x{2CFD}\x{2CFE}-\x{2CFF}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E00}-\x{2E01}\x{2E02}\x{2E03}\x{2E04}\x{2E05}\x{2E06}-\x{2E08}\x{2E09}\x{2E0A}\x{2E0B}\x{2E0C}\x{2E0D}\x{2E0E}-\x{2E16}\x{2E17}\x{2E18}-\x{2E19}\x{2E1A}\x{2E1B}\x{2E1C}\x{2E1D}\x{2E1E}-\x{2E1F}\x{2E20}\x{2E21}\x{2E22}\x{2E23}\x{2E24}\x{2E25}\x{2E26}\x{2E27}\x{2E28}\x{2E29}\x{2E2A}-\x{2E2E}\x{2E2F}\x{2E30}-\x{2E39}\x{2E3A}-\x{2E3B}\x{2E3C}-\x{2E3F}\x{2E40}\x{2E41}\x{2E42}\x{2E43}-\x{2E4F}\x{2E50}-\x{2E51}\x{2E52}\x{2E80}-\x{2E99}\x{2E9B}-\x{2EF3}\x{2F00}-\x{2FD5}\x{2FF0}-\x{2FFB}\x{3000}\x{3001}-\x{3003}\x{3004}\x{3008}\x{3009}\x{300A}\x{300B}\x{300C}\x{300D}\x{300E}\x{300F}\x{3010}\x{3011}\x{3012}-\x{3013}\x{3014}\x{3015}\x{3016}\x{3017}\x{3018}\x{3019}\x{301A}\x{301B}\x{301C}\x{301D}\x{301E}-\x{301F}\x{3020}\x{302A}-\x{302D}\x{3030}\x{3036}-\x{3037}\x{303D}\x{303E}-\x{303F}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{31C0}-\x{31E3}\x{321D}-\x{321E}\x{3250}\x{3251}-\x{325F}\x{327C}-\x{327E}\x{32B1}-\x{32BF}\x{32CC}-\x{32CF}\x{3377}-\x{337A}\x{33DE}-\x{33DF}\x{33FF}\x{4DC0}-\x{4DFF}\x{A490}-\x{A4C6}\x{A60D}-\x{A60F}\x{A66F}\x{A670}-\x{A672}\x{A673}\x{A674}-\x{A67D}\x{A67E}\x{A67F}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A788}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A828}-\x{A82B}\x{A82C}\x{A838}\x{A839}\x{A874}-\x{A877}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{AB6A}-\x{AB6B}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1D}\x{FB1E}\x{FB1F}-\x{FB28}\x{FB29}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD3E}\x{FD3F}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDD0}-\x{FDEF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFD}\x{FDFE}-\x{FDFF}\x{FE00}-\x{FE0F}\x{FE10}-\x{FE16}\x{FE17}\x{FE18}\x{FE19}\x{FE20}-\x{FE2F}\x{FE30}\x{FE31}-\x{FE32}\x{FE33}-\x{FE34}\x{FE35}\x{FE36}\x{FE37}\x{FE38}\x{FE39}\x{FE3A}\x{FE3B}\x{FE3C}\x{FE3D}\x{FE3E}\x{FE3F}\x{FE40}\x{FE41}\x{FE42}\x{FE43}\x{FE44}\x{FE45}-\x{FE46}\x{FE47}\x{FE48}\x{FE49}-\x{FE4C}\x{FE4D}-\x{FE4F}\x{FE50}\x{FE51}\x{FE52}\x{FE54}\x{FE55}\x{FE56}-\x{FE57}\x{FE58}\x{FE59}\x{FE5A}\x{FE5B}\x{FE5C}\x{FE5D}\x{FE5E}\x{FE5F}\x{FE60}-\x{FE61}\x{FE62}\x{FE63}\x{FE64}-\x{FE66}\x{FE68}\x{FE69}\x{FE6A}\x{FE6B}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FEFF}\x{FF01}-\x{FF02}\x{FF03}\x{FF04}\x{FF05}\x{FF06}-\x{FF07}\x{FF08}\x{FF09}\x{FF0A}\x{FF0B}\x{FF0C}\x{FF0D}\x{FF0E}-\x{FF0F}\x{FF1A}\x{FF1B}\x{FF1C}-\x{FF1E}\x{FF1F}-\x{FF20}\x{FF3B}\x{FF3C}\x{FF3D}\x{FF3E}\x{FF3F}\x{FF40}\x{FF5B}\x{FF5C}\x{FF5D}\x{FF5E}\x{FF5F}\x{FF60}\x{FF61}\x{FF62}\x{FF63}\x{FF64}-\x{FF65}\x{FFE0}-\x{FFE1}\x{FFE2}\x{FFE3}\x{FFE4}\x{FFE5}-\x{FFE6}\x{FFE8}\x{FFE9}-\x{FFEC}\x{FFED}-\x{FFEE}\x{FFF0}-\x{FFF8}\x{FFF9}-\x{FFFB}\x{FFFC}-\x{FFFD}\x{FFFE}-\x{FFFF}\x{10101}\x{10140}-\x{10174}\x{10175}-\x{10178}\x{10179}-\x{10189}\x{1018A}-\x{1018B}\x{1018C}\x{10190}-\x{1019C}\x{101A0}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{1091F}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A01}-\x{10A03}\x{10A04}\x{10A05}-\x{10A06}\x{10A07}-\x{10A0B}\x{10A0C}-\x{10A0F}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A38}-\x{10A3A}\x{10A3B}-\x{10A3E}\x{10A3F}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE5}-\x{10AE6}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B39}-\x{10B3F}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D24}-\x{10D27}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAB}-\x{10EAC}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F46}-\x{10F50}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{11001}\x{11038}-\x{11046}\x{11052}-\x{11065}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{11660}-\x{1166C}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{11FD5}-\x{11FDC}\x{11FDD}-\x{11FE0}\x{11FE1}-\x{11FF1}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE2}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D200}-\x{1D241}\x{1D242}-\x{1D244}\x{1D245}\x{1D300}-\x{1D356}\x{1D6DB}\x{1D715}\x{1D74F}\x{1D789}\x{1D7C3}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E2FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D0}-\x{1E8D6}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E944}-\x{1E94A}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF0}-\x{1EEF1}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F000}-\x{1F02B}\x{1F030}-\x{1F093}\x{1F0A0}-\x{1F0AE}\x{1F0B1}-\x{1F0BF}\x{1F0C1}-\x{1F0CF}\x{1F0D1}-\x{1F0F5}\x{1F10B}-\x{1F10C}\x{1F10D}-\x{1F10F}\x{1F12F}\x{1F16A}-\x{1F16F}\x{1F1AD}\x{1F260}-\x{1F265}\x{1F300}-\x{1F3FA}\x{1F3FB}-\x{1F3FF}\x{1F400}-\x{1F6D7}\x{1F6E0}-\x{1F6EC}\x{1F6F0}-\x{1F6FC}\x{1F700}-\x{1F773}\x{1F780}-\x{1F7D8}\x{1F7E0}-\x{1F7EB}\x{1F800}-\x{1F80B}\x{1F810}-\x{1F847}\x{1F850}-\x{1F859}\x{1F860}-\x{1F887}\x{1F890}-\x{1F8AD}\x{1F8B0}-\x{1F8B1}\x{1F900}-\x{1F978}\x{1F97A}-\x{1F9CB}\x{1F9CD}-\x{1FA53}\x{1FA60}-\x{1FA6D}\x{1FA70}-\x{1FA74}\x{1FA78}-\x{1FA7A}\x{1FA80}-\x{1FA86}\x{1FA90}-\x{1FAA8}\x{1FAB0}-\x{1FAB6}\x{1FAC0}-\x{1FAC2}\x{1FAD0}-\x{1FAD6}\x{1FB00}-\x{1FB92}\x{1FB94}-\x{1FBCA}\x{1FFFE}-\x{1FFFF}\x{2FFFE}-\x{2FFFF}\x{3FFFE}-\x{3FFFF}\x{4FFFE}-\x{4FFFF}\x{5FFFE}-\x{5FFFF}\x{6FFFE}-\x{6FFFF}\x{7FFFE}-\x{7FFFF}\x{8FFFE}-\x{8FFFF}\x{9FFFE}-\x{9FFFF}\x{AFFFE}-\x{AFFFF}\x{BFFFE}-\x{BFFFF}\x{CFFFE}-\x{CFFFF}\x{DFFFE}-\x{E0000}\x{E0001}\x{E0002}-\x{E001F}\x{E0020}-\x{E007F}\x{E0080}-\x{E00FF}\x{E0100}-\x{E01EF}\x{E01F0}-\x{E0FFF}\x{EFFFE}-\x{EFFFF}\x{FFFFE}-\x{FFFFF}\x{10FFFE}-\x{10FFFF}][\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1D167}-\x{1D169}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{E0100}-\x{E01EF}]*$/u';
+
+    const ZWNJ = '/([\x{A872}\x{10ACD}\x{10AD7}\x{10D00}\x{10FCB}\x{0620}\x{0626}\x{0628}\x{062A}-\x{062E}\x{0633}-\x{063F}\x{0641}-\x{0647}\x{0649}-\x{064A}\x{066E}-\x{066F}\x{0678}-\x{0687}\x{069A}-\x{06BF}\x{06C1}-\x{06C2}\x{06CC}\x{06CE}\x{06D0}-\x{06D1}\x{06FA}-\x{06FC}\x{06FF}\x{0712}-\x{0714}\x{071A}-\x{071D}\x{071F}-\x{0727}\x{0729}\x{072B}\x{072D}-\x{072E}\x{074E}-\x{0758}\x{075C}-\x{076A}\x{076D}-\x{0770}\x{0772}\x{0775}-\x{0777}\x{077A}-\x{077F}\x{07CA}-\x{07EA}\x{0841}-\x{0845}\x{0848}\x{084A}-\x{0853}\x{0855}\x{0860}\x{0862}-\x{0865}\x{0868}\x{08A0}-\x{08A9}\x{08AF}-\x{08B0}\x{08B3}-\x{08B4}\x{08B6}-\x{08B8}\x{08BA}-\x{08C7}\x{1807}\x{1820}-\x{1842}\x{1843}\x{1844}-\x{1878}\x{1887}-\x{18A8}\x{18AA}\x{A840}-\x{A871}\x{10AC0}-\x{10AC4}\x{10AD3}-\x{10AD6}\x{10AD8}-\x{10ADC}\x{10ADE}-\x{10AE0}\x{10AEB}-\x{10AEE}\x{10B80}\x{10B82}\x{10B86}-\x{10B88}\x{10B8A}-\x{10B8B}\x{10B8D}\x{10B90}\x{10BAD}-\x{10BAE}\x{10D01}-\x{10D21}\x{10D23}\x{10F30}-\x{10F32}\x{10F34}-\x{10F44}\x{10F51}-\x{10F53}\x{10FB0}\x{10FB2}-\x{10FB3}\x{10FB8}\x{10FBB}-\x{10FBC}\x{10FBE}-\x{10FBF}\x{10FC1}\x{10FC4}\x{10FCA}\x{1E900}-\x{1E943}][\x{00AD}\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{061C}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{200B}\x{200E}-\x{200F}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{206A}-\x{206F}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{FEFF}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{13430}-\x{13438}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1E94B}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}]*\x{200C}[\x{00AD}\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{061C}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{200B}\x{200E}-\x{200F}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{206A}-\x{206F}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{FEFF}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{13430}-\x{13438}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1E94B}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}]*)[\x{0622}-\x{0625}\x{0627}\x{0629}\x{062F}-\x{0632}\x{0648}\x{0671}-\x{0673}\x{0675}-\x{0677}\x{0688}-\x{0699}\x{06C0}\x{06C3}-\x{06CB}\x{06CD}\x{06CF}\x{06D2}-\x{06D3}\x{06D5}\x{06EE}-\x{06EF}\x{0710}\x{0715}-\x{0719}\x{071E}\x{0728}\x{072A}\x{072C}\x{072F}\x{074D}\x{0759}-\x{075B}\x{076B}-\x{076C}\x{0771}\x{0773}-\x{0774}\x{0778}-\x{0779}\x{0840}\x{0846}-\x{0847}\x{0849}\x{0854}\x{0856}-\x{0858}\x{0867}\x{0869}-\x{086A}\x{08AA}-\x{08AC}\x{08AE}\x{08B1}-\x{08B2}\x{08B9}\x{10AC5}\x{10AC7}\x{10AC9}-\x{10ACA}\x{10ACE}-\x{10AD2}\x{10ADD}\x{10AE1}\x{10AE4}\x{10AEF}\x{10B81}\x{10B83}-\x{10B85}\x{10B89}\x{10B8C}\x{10B8E}-\x{10B8F}\x{10B91}\x{10BA9}-\x{10BAC}\x{10D22}\x{10F33}\x{10F54}\x{10FB4}-\x{10FB6}\x{10FB9}-\x{10FBA}\x{10FBD}\x{10FC2}-\x{10FC3}\x{10FC9}\x{0620}\x{0626}\x{0628}\x{062A}-\x{062E}\x{0633}-\x{063F}\x{0641}-\x{0647}\x{0649}-\x{064A}\x{066E}-\x{066F}\x{0678}-\x{0687}\x{069A}-\x{06BF}\x{06C1}-\x{06C2}\x{06CC}\x{06CE}\x{06D0}-\x{06D1}\x{06FA}-\x{06FC}\x{06FF}\x{0712}-\x{0714}\x{071A}-\x{071D}\x{071F}-\x{0727}\x{0729}\x{072B}\x{072D}-\x{072E}\x{074E}-\x{0758}\x{075C}-\x{076A}\x{076D}-\x{0770}\x{0772}\x{0775}-\x{0777}\x{077A}-\x{077F}\x{07CA}-\x{07EA}\x{0841}-\x{0845}\x{0848}\x{084A}-\x{0853}\x{0855}\x{0860}\x{0862}-\x{0865}\x{0868}\x{08A0}-\x{08A9}\x{08AF}-\x{08B0}\x{08B3}-\x{08B4}\x{08B6}-\x{08B8}\x{08BA}-\x{08C7}\x{1807}\x{1820}-\x{1842}\x{1843}\x{1844}-\x{1878}\x{1887}-\x{18A8}\x{18AA}\x{A840}-\x{A871}\x{10AC0}-\x{10AC4}\x{10AD3}-\x{10AD6}\x{10AD8}-\x{10ADC}\x{10ADE}-\x{10AE0}\x{10AEB}-\x{10AEE}\x{10B80}\x{10B82}\x{10B86}-\x{10B88}\x{10B8A}-\x{10B8B}\x{10B8D}\x{10B90}\x{10BAD}-\x{10BAE}\x{10D01}-\x{10D21}\x{10D23}\x{10F30}-\x{10F32}\x{10F34}-\x{10F44}\x{10F51}-\x{10F53}\x{10FB0}\x{10FB2}-\x{10FB3}\x{10FB8}\x{10FBB}-\x{10FBC}\x{10FBE}-\x{10FBF}\x{10FC1}\x{10FC4}\x{10FCA}\x{1E900}-\x{1E943}]/u';
+}
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php
new file mode 100644
index 000000000..0bbd33567
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php
@@ -0,0 +1,8 @@
+<?php
+
+return array (
+  223 => 'ss',
+  962 => 'σ',
+  8204 => '',
+  8205 => '',
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php
new file mode 100644
index 000000000..25a5f564d
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php
@@ -0,0 +1,2638 @@
+<?php
+
+return array (
+  888 => true,
+  889 => true,
+  896 => true,
+  897 => true,
+  898 => true,
+  899 => true,
+  907 => true,
+  909 => true,
+  930 => true,
+  1216 => true,
+  1328 => true,
+  1367 => true,
+  1368 => true,
+  1419 => true,
+  1420 => true,
+  1424 => true,
+  1480 => true,
+  1481 => true,
+  1482 => true,
+  1483 => true,
+  1484 => true,
+  1485 => true,
+  1486 => true,
+  1487 => true,
+  1515 => true,
+  1516 => true,
+  1517 => true,
+  1518 => true,
+  1525 => true,
+  1526 => true,
+  1527 => true,
+  1528 => true,
+  1529 => true,
+  1530 => true,
+  1531 => true,
+  1532 => true,
+  1533 => true,
+  1534 => true,
+  1535 => true,
+  1536 => true,
+  1537 => true,
+  1538 => true,
+  1539 => true,
+  1540 => true,
+  1541 => true,
+  1564 => true,
+  1565 => true,
+  1757 => true,
+  1806 => true,
+  1807 => true,
+  1867 => true,
+  1868 => true,
+  1970 => true,
+  1971 => true,
+  1972 => true,
+  1973 => true,
+  1974 => true,
+  1975 => true,
+  1976 => true,
+  1977 => true,
+  1978 => true,
+  1979 => true,
+  1980 => true,
+  1981 => true,
+  1982 => true,
+  1983 => true,
+  2043 => true,
+  2044 => true,
+  2094 => true,
+  2095 => true,
+  2111 => true,
+  2140 => true,
+  2141 => true,
+  2143 => true,
+  2229 => true,
+  2248 => true,
+  2249 => true,
+  2250 => true,
+  2251 => true,
+  2252 => true,
+  2253 => true,
+  2254 => true,
+  2255 => true,
+  2256 => true,
+  2257 => true,
+  2258 => true,
+  2274 => true,
+  2436 => true,
+  2445 => true,
+  2446 => true,
+  2449 => true,
+  2450 => true,
+  2473 => true,
+  2481 => true,
+  2483 => true,
+  2484 => true,
+  2485 => true,
+  2490 => true,
+  2491 => true,
+  2501 => true,
+  2502 => true,
+  2505 => true,
+  2506 => true,
+  2511 => true,
+  2512 => true,
+  2513 => true,
+  2514 => true,
+  2515 => true,
+  2516 => true,
+  2517 => true,
+  2518 => true,
+  2520 => true,
+  2521 => true,
+  2522 => true,
+  2523 => true,
+  2526 => true,
+  2532 => true,
+  2533 => true,
+  2559 => true,
+  2560 => true,
+  2564 => true,
+  2571 => true,
+  2572 => true,
+  2573 => true,
+  2574 => true,
+  2577 => true,
+  2578 => true,
+  2601 => true,
+  2609 => true,
+  2612 => true,
+  2615 => true,
+  2618 => true,
+  2619 => true,
+  2621 => true,
+  2627 => true,
+  2628 => true,
+  2629 => true,
+  2630 => true,
+  2633 => true,
+  2634 => true,
+  2638 => true,
+  2639 => true,
+  2640 => true,
+  2642 => true,
+  2643 => true,
+  2644 => true,
+  2645 => true,
+  2646 => true,
+  2647 => true,
+  2648 => true,
+  2653 => true,
+  2655 => true,
+  2656 => true,
+  2657 => true,
+  2658 => true,
+  2659 => true,
+  2660 => true,
+  2661 => true,
+  2679 => true,
+  2680 => true,
+  2681 => true,
+  2682 => true,
+  2683 => true,
+  2684 => true,
+  2685 => true,
+  2686 => true,
+  2687 => true,
+  2688 => true,
+  2692 => true,
+  2702 => true,
+  2706 => true,
+  2729 => true,
+  2737 => true,
+  2740 => true,
+  2746 => true,
+  2747 => true,
+  2758 => true,
+  2762 => true,
+  2766 => true,
+  2767 => true,
+  2769 => true,
+  2770 => true,
+  2771 => true,
+  2772 => true,
+  2773 => true,
+  2774 => true,
+  2775 => true,
+  2776 => true,
+  2777 => true,
+  2778 => true,
+  2779 => true,
+  2780 => true,
+  2781 => true,
+  2782 => true,
+  2783 => true,
+  2788 => true,
+  2789 => true,
+  2802 => true,
+  2803 => true,
+  2804 => true,
+  2805 => true,
+  2806 => true,
+  2807 => true,
+  2808 => true,
+  2816 => true,
+  2820 => true,
+  2829 => true,
+  2830 => true,
+  2833 => true,
+  2834 => true,
+  2857 => true,
+  2865 => true,
+  2868 => true,
+  2874 => true,
+  2875 => true,
+  2885 => true,
+  2886 => true,
+  2889 => true,
+  2890 => true,
+  2894 => true,
+  2895 => true,
+  2896 => true,
+  2897 => true,
+  2898 => true,
+  2899 => true,
+  2900 => true,
+  2904 => true,
+  2905 => true,
+  2906 => true,
+  2907 => true,
+  2910 => true,
+  2916 => true,
+  2917 => true,
+  2936 => true,
+  2937 => true,
+  2938 => true,
+  2939 => true,
+  2940 => true,
+  2941 => true,
+  2942 => true,
+  2943 => true,
+  2944 => true,
+  2945 => true,
+  2948 => true,
+  2955 => true,
+  2956 => true,
+  2957 => true,
+  2961 => true,
+  2966 => true,
+  2967 => true,
+  2968 => true,
+  2971 => true,
+  2973 => true,
+  2976 => true,
+  2977 => true,
+  2978 => true,
+  2981 => true,
+  2982 => true,
+  2983 => true,
+  2987 => true,
+  2988 => true,
+  2989 => true,
+  3002 => true,
+  3003 => true,
+  3004 => true,
+  3005 => true,
+  3011 => true,
+  3012 => true,
+  3013 => true,
+  3017 => true,
+  3022 => true,
+  3023 => true,
+  3025 => true,
+  3026 => true,
+  3027 => true,
+  3028 => true,
+  3029 => true,
+  3030 => true,
+  3032 => true,
+  3033 => true,
+  3034 => true,
+  3035 => true,
+  3036 => true,
+  3037 => true,
+  3038 => true,
+  3039 => true,
+  3040 => true,
+  3041 => true,
+  3042 => true,
+  3043 => true,
+  3044 => true,
+  3045 => true,
+  3067 => true,
+  3068 => true,
+  3069 => true,
+  3070 => true,
+  3071 => true,
+  3085 => true,
+  3089 => true,
+  3113 => true,
+  3130 => true,
+  3131 => true,
+  3132 => true,
+  3141 => true,
+  3145 => true,
+  3150 => true,
+  3151 => true,
+  3152 => true,
+  3153 => true,
+  3154 => true,
+  3155 => true,
+  3156 => true,
+  3159 => true,
+  3163 => true,
+  3164 => true,
+  3165 => true,
+  3166 => true,
+  3167 => true,
+  3172 => true,
+  3173 => true,
+  3184 => true,
+  3185 => true,
+  3186 => true,
+  3187 => true,
+  3188 => true,
+  3189 => true,
+  3190 => true,
+  3213 => true,
+  3217 => true,
+  3241 => true,
+  3252 => true,
+  3258 => true,
+  3259 => true,
+  3269 => true,
+  3273 => true,
+  3278 => true,
+  3279 => true,
+  3280 => true,
+  3281 => true,
+  3282 => true,
+  3283 => true,
+  3284 => true,
+  3287 => true,
+  3288 => true,
+  3289 => true,
+  3290 => true,
+  3291 => true,
+  3292 => true,
+  3293 => true,
+  3295 => true,
+  3300 => true,
+  3301 => true,
+  3312 => true,
+  3315 => true,
+  3316 => true,
+  3317 => true,
+  3318 => true,
+  3319 => true,
+  3320 => true,
+  3321 => true,
+  3322 => true,
+  3323 => true,
+  3324 => true,
+  3325 => true,
+  3326 => true,
+  3327 => true,
+  3341 => true,
+  3345 => true,
+  3397 => true,
+  3401 => true,
+  3408 => true,
+  3409 => true,
+  3410 => true,
+  3411 => true,
+  3428 => true,
+  3429 => true,
+  3456 => true,
+  3460 => true,
+  3479 => true,
+  3480 => true,
+  3481 => true,
+  3506 => true,
+  3516 => true,
+  3518 => true,
+  3519 => true,
+  3527 => true,
+  3528 => true,
+  3529 => true,
+  3531 => true,
+  3532 => true,
+  3533 => true,
+  3534 => true,
+  3541 => true,
+  3543 => true,
+  3552 => true,
+  3553 => true,
+  3554 => true,
+  3555 => true,
+  3556 => true,
+  3557 => true,
+  3568 => true,
+  3569 => true,
+  3573 => true,
+  3574 => true,
+  3575 => true,
+  3576 => true,
+  3577 => true,
+  3578 => true,
+  3579 => true,
+  3580 => true,
+  3581 => true,
+  3582 => true,
+  3583 => true,
+  3584 => true,
+  3643 => true,
+  3644 => true,
+  3645 => true,
+  3646 => true,
+  3715 => true,
+  3717 => true,
+  3723 => true,
+  3748 => true,
+  3750 => true,
+  3774 => true,
+  3775 => true,
+  3781 => true,
+  3783 => true,
+  3790 => true,
+  3791 => true,
+  3802 => true,
+  3803 => true,
+  3912 => true,
+  3949 => true,
+  3950 => true,
+  3951 => true,
+  3952 => true,
+  3992 => true,
+  4029 => true,
+  4045 => true,
+  4294 => true,
+  4296 => true,
+  4297 => true,
+  4298 => true,
+  4299 => true,
+  4300 => true,
+  4302 => true,
+  4303 => true,
+  4447 => true,
+  4448 => true,
+  4681 => true,
+  4686 => true,
+  4687 => true,
+  4695 => true,
+  4697 => true,
+  4702 => true,
+  4703 => true,
+  4745 => true,
+  4750 => true,
+  4751 => true,
+  4785 => true,
+  4790 => true,
+  4791 => true,
+  4799 => true,
+  4801 => true,
+  4806 => true,
+  4807 => true,
+  4823 => true,
+  4881 => true,
+  4886 => true,
+  4887 => true,
+  4955 => true,
+  4956 => true,
+  4989 => true,
+  4990 => true,
+  4991 => true,
+  5018 => true,
+  5019 => true,
+  5020 => true,
+  5021 => true,
+  5022 => true,
+  5023 => true,
+  5110 => true,
+  5111 => true,
+  5118 => true,
+  5119 => true,
+  5760 => true,
+  5789 => true,
+  5790 => true,
+  5791 => true,
+  5881 => true,
+  5882 => true,
+  5883 => true,
+  5884 => true,
+  5885 => true,
+  5886 => true,
+  5887 => true,
+  5901 => true,
+  5909 => true,
+  5910 => true,
+  5911 => true,
+  5912 => true,
+  5913 => true,
+  5914 => true,
+  5915 => true,
+  5916 => true,
+  5917 => true,
+  5918 => true,
+  5919 => true,
+  5943 => true,
+  5944 => true,
+  5945 => true,
+  5946 => true,
+  5947 => true,
+  5948 => true,
+  5949 => true,
+  5950 => true,
+  5951 => true,
+  5972 => true,
+  5973 => true,
+  5974 => true,
+  5975 => true,
+  5976 => true,
+  5977 => true,
+  5978 => true,
+  5979 => true,
+  5980 => true,
+  5981 => true,
+  5982 => true,
+  5983 => true,
+  5997 => true,
+  6001 => true,
+  6004 => true,
+  6005 => true,
+  6006 => true,
+  6007 => true,
+  6008 => true,
+  6009 => true,
+  6010 => true,
+  6011 => true,
+  6012 => true,
+  6013 => true,
+  6014 => true,
+  6015 => true,
+  6068 => true,
+  6069 => true,
+  6110 => true,
+  6111 => true,
+  6122 => true,
+  6123 => true,
+  6124 => true,
+  6125 => true,
+  6126 => true,
+  6127 => true,
+  6138 => true,
+  6139 => true,
+  6140 => true,
+  6141 => true,
+  6142 => true,
+  6143 => true,
+  6150 => true,
+  6158 => true,
+  6159 => true,
+  6170 => true,
+  6171 => true,
+  6172 => true,
+  6173 => true,
+  6174 => true,
+  6175 => true,
+  6265 => true,
+  6266 => true,
+  6267 => true,
+  6268 => true,
+  6269 => true,
+  6270 => true,
+  6271 => true,
+  6315 => true,
+  6316 => true,
+  6317 => true,
+  6318 => true,
+  6319 => true,
+  6390 => true,
+  6391 => true,
+  6392 => true,
+  6393 => true,
+  6394 => true,
+  6395 => true,
+  6396 => true,
+  6397 => true,
+  6398 => true,
+  6399 => true,
+  6431 => true,
+  6444 => true,
+  6445 => true,
+  6446 => true,
+  6447 => true,
+  6460 => true,
+  6461 => true,
+  6462 => true,
+  6463 => true,
+  6465 => true,
+  6466 => true,
+  6467 => true,
+  6510 => true,
+  6511 => true,
+  6517 => true,
+  6518 => true,
+  6519 => true,
+  6520 => true,
+  6521 => true,
+  6522 => true,
+  6523 => true,
+  6524 => true,
+  6525 => true,
+  6526 => true,
+  6527 => true,
+  6572 => true,
+  6573 => true,
+  6574 => true,
+  6575 => true,
+  6602 => true,
+  6603 => true,
+  6604 => true,
+  6605 => true,
+  6606 => true,
+  6607 => true,
+  6619 => true,
+  6620 => true,
+  6621 => true,
+  6684 => true,
+  6685 => true,
+  6751 => true,
+  6781 => true,
+  6782 => true,
+  6794 => true,
+  6795 => true,
+  6796 => true,
+  6797 => true,
+  6798 => true,
+  6799 => true,
+  6810 => true,
+  6811 => true,
+  6812 => true,
+  6813 => true,
+  6814 => true,
+  6815 => true,
+  6830 => true,
+  6831 => true,
+  6988 => true,
+  6989 => true,
+  6990 => true,
+  6991 => true,
+  7037 => true,
+  7038 => true,
+  7039 => true,
+  7156 => true,
+  7157 => true,
+  7158 => true,
+  7159 => true,
+  7160 => true,
+  7161 => true,
+  7162 => true,
+  7163 => true,
+  7224 => true,
+  7225 => true,
+  7226 => true,
+  7242 => true,
+  7243 => true,
+  7244 => true,
+  7305 => true,
+  7306 => true,
+  7307 => true,
+  7308 => true,
+  7309 => true,
+  7310 => true,
+  7311 => true,
+  7355 => true,
+  7356 => true,
+  7368 => true,
+  7369 => true,
+  7370 => true,
+  7371 => true,
+  7372 => true,
+  7373 => true,
+  7374 => true,
+  7375 => true,
+  7419 => true,
+  7420 => true,
+  7421 => true,
+  7422 => true,
+  7423 => true,
+  7674 => true,
+  7958 => true,
+  7959 => true,
+  7966 => true,
+  7967 => true,
+  8006 => true,
+  8007 => true,
+  8014 => true,
+  8015 => true,
+  8024 => true,
+  8026 => true,
+  8028 => true,
+  8030 => true,
+  8062 => true,
+  8063 => true,
+  8117 => true,
+  8133 => true,
+  8148 => true,
+  8149 => true,
+  8156 => true,
+  8176 => true,
+  8177 => true,
+  8181 => true,
+  8191 => true,
+  8206 => true,
+  8207 => true,
+  8228 => true,
+  8229 => true,
+  8230 => true,
+  8232 => true,
+  8233 => true,
+  8234 => true,
+  8235 => true,
+  8236 => true,
+  8237 => true,
+  8238 => true,
+  8289 => true,
+  8290 => true,
+  8291 => true,
+  8293 => true,
+  8294 => true,
+  8295 => true,
+  8296 => true,
+  8297 => true,
+  8298 => true,
+  8299 => true,
+  8300 => true,
+  8301 => true,
+  8302 => true,
+  8303 => true,
+  8306 => true,
+  8307 => true,
+  8335 => true,
+  8349 => true,
+  8350 => true,
+  8351 => true,
+  8384 => true,
+  8385 => true,
+  8386 => true,
+  8387 => true,
+  8388 => true,
+  8389 => true,
+  8390 => true,
+  8391 => true,
+  8392 => true,
+  8393 => true,
+  8394 => true,
+  8395 => true,
+  8396 => true,
+  8397 => true,
+  8398 => true,
+  8399 => true,
+  8433 => true,
+  8434 => true,
+  8435 => true,
+  8436 => true,
+  8437 => true,
+  8438 => true,
+  8439 => true,
+  8440 => true,
+  8441 => true,
+  8442 => true,
+  8443 => true,
+  8444 => true,
+  8445 => true,
+  8446 => true,
+  8447 => true,
+  8498 => true,
+  8579 => true,
+  8588 => true,
+  8589 => true,
+  8590 => true,
+  8591 => true,
+  9255 => true,
+  9256 => true,
+  9257 => true,
+  9258 => true,
+  9259 => true,
+  9260 => true,
+  9261 => true,
+  9262 => true,
+  9263 => true,
+  9264 => true,
+  9265 => true,
+  9266 => true,
+  9267 => true,
+  9268 => true,
+  9269 => true,
+  9270 => true,
+  9271 => true,
+  9272 => true,
+  9273 => true,
+  9274 => true,
+  9275 => true,
+  9276 => true,
+  9277 => true,
+  9278 => true,
+  9279 => true,
+  9291 => true,
+  9292 => true,
+  9293 => true,
+  9294 => true,
+  9295 => true,
+  9296 => true,
+  9297 => true,
+  9298 => true,
+  9299 => true,
+  9300 => true,
+  9301 => true,
+  9302 => true,
+  9303 => true,
+  9304 => true,
+  9305 => true,
+  9306 => true,
+  9307 => true,
+  9308 => true,
+  9309 => true,
+  9310 => true,
+  9311 => true,
+  9352 => true,
+  9353 => true,
+  9354 => true,
+  9355 => true,
+  9356 => true,
+  9357 => true,
+  9358 => true,
+  9359 => true,
+  9360 => true,
+  9361 => true,
+  9362 => true,
+  9363 => true,
+  9364 => true,
+  9365 => true,
+  9366 => true,
+  9367 => true,
+  9368 => true,
+  9369 => true,
+  9370 => true,
+  9371 => true,
+  11124 => true,
+  11125 => true,
+  11158 => true,
+  11311 => true,
+  11359 => true,
+  11508 => true,
+  11509 => true,
+  11510 => true,
+  11511 => true,
+  11512 => true,
+  11558 => true,
+  11560 => true,
+  11561 => true,
+  11562 => true,
+  11563 => true,
+  11564 => true,
+  11566 => true,
+  11567 => true,
+  11624 => true,
+  11625 => true,
+  11626 => true,
+  11627 => true,
+  11628 => true,
+  11629 => true,
+  11630 => true,
+  11633 => true,
+  11634 => true,
+  11635 => true,
+  11636 => true,
+  11637 => true,
+  11638 => true,
+  11639 => true,
+  11640 => true,
+  11641 => true,
+  11642 => true,
+  11643 => true,
+  11644 => true,
+  11645 => true,
+  11646 => true,
+  11671 => true,
+  11672 => true,
+  11673 => true,
+  11674 => true,
+  11675 => true,
+  11676 => true,
+  11677 => true,
+  11678 => true,
+  11679 => true,
+  11687 => true,
+  11695 => true,
+  11703 => true,
+  11711 => true,
+  11719 => true,
+  11727 => true,
+  11735 => true,
+  11743 => true,
+  11930 => true,
+  12020 => true,
+  12021 => true,
+  12022 => true,
+  12023 => true,
+  12024 => true,
+  12025 => true,
+  12026 => true,
+  12027 => true,
+  12028 => true,
+  12029 => true,
+  12030 => true,
+  12031 => true,
+  12246 => true,
+  12247 => true,
+  12248 => true,
+  12249 => true,
+  12250 => true,
+  12251 => true,
+  12252 => true,
+  12253 => true,
+  12254 => true,
+  12255 => true,
+  12256 => true,
+  12257 => true,
+  12258 => true,
+  12259 => true,
+  12260 => true,
+  12261 => true,
+  12262 => true,
+  12263 => true,
+  12264 => true,
+  12265 => true,
+  12266 => true,
+  12267 => true,
+  12268 => true,
+  12269 => true,
+  12270 => true,
+  12271 => true,
+  12272 => true,
+  12273 => true,
+  12274 => true,
+  12275 => true,
+  12276 => true,
+  12277 => true,
+  12278 => true,
+  12279 => true,
+  12280 => true,
+  12281 => true,
+  12282 => true,
+  12283 => true,
+  12284 => true,
+  12285 => true,
+  12286 => true,
+  12287 => true,
+  12352 => true,
+  12439 => true,
+  12440 => true,
+  12544 => true,
+  12545 => true,
+  12546 => true,
+  12547 => true,
+  12548 => true,
+  12592 => true,
+  12644 => true,
+  12687 => true,
+  12772 => true,
+  12773 => true,
+  12774 => true,
+  12775 => true,
+  12776 => true,
+  12777 => true,
+  12778 => true,
+  12779 => true,
+  12780 => true,
+  12781 => true,
+  12782 => true,
+  12783 => true,
+  12831 => true,
+  13250 => true,
+  13255 => true,
+  13272 => true,
+  40957 => true,
+  40958 => true,
+  40959 => true,
+  42125 => true,
+  42126 => true,
+  42127 => true,
+  42183 => true,
+  42184 => true,
+  42185 => true,
+  42186 => true,
+  42187 => true,
+  42188 => true,
+  42189 => true,
+  42190 => true,
+  42191 => true,
+  42540 => true,
+  42541 => true,
+  42542 => true,
+  42543 => true,
+  42544 => true,
+  42545 => true,
+  42546 => true,
+  42547 => true,
+  42548 => true,
+  42549 => true,
+  42550 => true,
+  42551 => true,
+  42552 => true,
+  42553 => true,
+  42554 => true,
+  42555 => true,
+  42556 => true,
+  42557 => true,
+  42558 => true,
+  42559 => true,
+  42744 => true,
+  42745 => true,
+  42746 => true,
+  42747 => true,
+  42748 => true,
+  42749 => true,
+  42750 => true,
+  42751 => true,
+  42944 => true,
+  42945 => true,
+  43053 => true,
+  43054 => true,
+  43055 => true,
+  43066 => true,
+  43067 => true,
+  43068 => true,
+  43069 => true,
+  43070 => true,
+  43071 => true,
+  43128 => true,
+  43129 => true,
+  43130 => true,
+  43131 => true,
+  43132 => true,
+  43133 => true,
+  43134 => true,
+  43135 => true,
+  43206 => true,
+  43207 => true,
+  43208 => true,
+  43209 => true,
+  43210 => true,
+  43211 => true,
+  43212 => true,
+  43213 => true,
+  43226 => true,
+  43227 => true,
+  43228 => true,
+  43229 => true,
+  43230 => true,
+  43231 => true,
+  43348 => true,
+  43349 => true,
+  43350 => true,
+  43351 => true,
+  43352 => true,
+  43353 => true,
+  43354 => true,
+  43355 => true,
+  43356 => true,
+  43357 => true,
+  43358 => true,
+  43389 => true,
+  43390 => true,
+  43391 => true,
+  43470 => true,
+  43482 => true,
+  43483 => true,
+  43484 => true,
+  43485 => true,
+  43519 => true,
+  43575 => true,
+  43576 => true,
+  43577 => true,
+  43578 => true,
+  43579 => true,
+  43580 => true,
+  43581 => true,
+  43582 => true,
+  43583 => true,
+  43598 => true,
+  43599 => true,
+  43610 => true,
+  43611 => true,
+  43715 => true,
+  43716 => true,
+  43717 => true,
+  43718 => true,
+  43719 => true,
+  43720 => true,
+  43721 => true,
+  43722 => true,
+  43723 => true,
+  43724 => true,
+  43725 => true,
+  43726 => true,
+  43727 => true,
+  43728 => true,
+  43729 => true,
+  43730 => true,
+  43731 => true,
+  43732 => true,
+  43733 => true,
+  43734 => true,
+  43735 => true,
+  43736 => true,
+  43737 => true,
+  43738 => true,
+  43767 => true,
+  43768 => true,
+  43769 => true,
+  43770 => true,
+  43771 => true,
+  43772 => true,
+  43773 => true,
+  43774 => true,
+  43775 => true,
+  43776 => true,
+  43783 => true,
+  43784 => true,
+  43791 => true,
+  43792 => true,
+  43799 => true,
+  43800 => true,
+  43801 => true,
+  43802 => true,
+  43803 => true,
+  43804 => true,
+  43805 => true,
+  43806 => true,
+  43807 => true,
+  43815 => true,
+  43823 => true,
+  43884 => true,
+  43885 => true,
+  43886 => true,
+  43887 => true,
+  44014 => true,
+  44015 => true,
+  44026 => true,
+  44027 => true,
+  44028 => true,
+  44029 => true,
+  44030 => true,
+  44031 => true,
+  55204 => true,
+  55205 => true,
+  55206 => true,
+  55207 => true,
+  55208 => true,
+  55209 => true,
+  55210 => true,
+  55211 => true,
+  55212 => true,
+  55213 => true,
+  55214 => true,
+  55215 => true,
+  55239 => true,
+  55240 => true,
+  55241 => true,
+  55242 => true,
+  55292 => true,
+  55293 => true,
+  55294 => true,
+  55295 => true,
+  64110 => true,
+  64111 => true,
+  64263 => true,
+  64264 => true,
+  64265 => true,
+  64266 => true,
+  64267 => true,
+  64268 => true,
+  64269 => true,
+  64270 => true,
+  64271 => true,
+  64272 => true,
+  64273 => true,
+  64274 => true,
+  64280 => true,
+  64281 => true,
+  64282 => true,
+  64283 => true,
+  64284 => true,
+  64311 => true,
+  64317 => true,
+  64319 => true,
+  64322 => true,
+  64325 => true,
+  64450 => true,
+  64451 => true,
+  64452 => true,
+  64453 => true,
+  64454 => true,
+  64455 => true,
+  64456 => true,
+  64457 => true,
+  64458 => true,
+  64459 => true,
+  64460 => true,
+  64461 => true,
+  64462 => true,
+  64463 => true,
+  64464 => true,
+  64465 => true,
+  64466 => true,
+  64832 => true,
+  64833 => true,
+  64834 => true,
+  64835 => true,
+  64836 => true,
+  64837 => true,
+  64838 => true,
+  64839 => true,
+  64840 => true,
+  64841 => true,
+  64842 => true,
+  64843 => true,
+  64844 => true,
+  64845 => true,
+  64846 => true,
+  64847 => true,
+  64912 => true,
+  64913 => true,
+  64968 => true,
+  64969 => true,
+  64970 => true,
+  64971 => true,
+  64972 => true,
+  64973 => true,
+  64974 => true,
+  64975 => true,
+  65022 => true,
+  65023 => true,
+  65042 => true,
+  65049 => true,
+  65050 => true,
+  65051 => true,
+  65052 => true,
+  65053 => true,
+  65054 => true,
+  65055 => true,
+  65072 => true,
+  65106 => true,
+  65107 => true,
+  65127 => true,
+  65132 => true,
+  65133 => true,
+  65134 => true,
+  65135 => true,
+  65141 => true,
+  65277 => true,
+  65278 => true,
+  65280 => true,
+  65440 => true,
+  65471 => true,
+  65472 => true,
+  65473 => true,
+  65480 => true,
+  65481 => true,
+  65488 => true,
+  65489 => true,
+  65496 => true,
+  65497 => true,
+  65501 => true,
+  65502 => true,
+  65503 => true,
+  65511 => true,
+  65519 => true,
+  65520 => true,
+  65521 => true,
+  65522 => true,
+  65523 => true,
+  65524 => true,
+  65525 => true,
+  65526 => true,
+  65527 => true,
+  65528 => true,
+  65529 => true,
+  65530 => true,
+  65531 => true,
+  65532 => true,
+  65533 => true,
+  65534 => true,
+  65535 => true,
+  65548 => true,
+  65575 => true,
+  65595 => true,
+  65598 => true,
+  65614 => true,
+  65615 => true,
+  65787 => true,
+  65788 => true,
+  65789 => true,
+  65790 => true,
+  65791 => true,
+  65795 => true,
+  65796 => true,
+  65797 => true,
+  65798 => true,
+  65844 => true,
+  65845 => true,
+  65846 => true,
+  65935 => true,
+  65949 => true,
+  65950 => true,
+  65951 => true,
+  66205 => true,
+  66206 => true,
+  66207 => true,
+  66257 => true,
+  66258 => true,
+  66259 => true,
+  66260 => true,
+  66261 => true,
+  66262 => true,
+  66263 => true,
+  66264 => true,
+  66265 => true,
+  66266 => true,
+  66267 => true,
+  66268 => true,
+  66269 => true,
+  66270 => true,
+  66271 => true,
+  66300 => true,
+  66301 => true,
+  66302 => true,
+  66303 => true,
+  66340 => true,
+  66341 => true,
+  66342 => true,
+  66343 => true,
+  66344 => true,
+  66345 => true,
+  66346 => true,
+  66347 => true,
+  66348 => true,
+  66379 => true,
+  66380 => true,
+  66381 => true,
+  66382 => true,
+  66383 => true,
+  66427 => true,
+  66428 => true,
+  66429 => true,
+  66430 => true,
+  66431 => true,
+  66462 => true,
+  66500 => true,
+  66501 => true,
+  66502 => true,
+  66503 => true,
+  66718 => true,
+  66719 => true,
+  66730 => true,
+  66731 => true,
+  66732 => true,
+  66733 => true,
+  66734 => true,
+  66735 => true,
+  66772 => true,
+  66773 => true,
+  66774 => true,
+  66775 => true,
+  66812 => true,
+  66813 => true,
+  66814 => true,
+  66815 => true,
+  66856 => true,
+  66857 => true,
+  66858 => true,
+  66859 => true,
+  66860 => true,
+  66861 => true,
+  66862 => true,
+  66863 => true,
+  66916 => true,
+  66917 => true,
+  66918 => true,
+  66919 => true,
+  66920 => true,
+  66921 => true,
+  66922 => true,
+  66923 => true,
+  66924 => true,
+  66925 => true,
+  66926 => true,
+  67383 => true,
+  67384 => true,
+  67385 => true,
+  67386 => true,
+  67387 => true,
+  67388 => true,
+  67389 => true,
+  67390 => true,
+  67391 => true,
+  67414 => true,
+  67415 => true,
+  67416 => true,
+  67417 => true,
+  67418 => true,
+  67419 => true,
+  67420 => true,
+  67421 => true,
+  67422 => true,
+  67423 => true,
+  67590 => true,
+  67591 => true,
+  67593 => true,
+  67638 => true,
+  67641 => true,
+  67642 => true,
+  67643 => true,
+  67645 => true,
+  67646 => true,
+  67670 => true,
+  67743 => true,
+  67744 => true,
+  67745 => true,
+  67746 => true,
+  67747 => true,
+  67748 => true,
+  67749 => true,
+  67750 => true,
+  67827 => true,
+  67830 => true,
+  67831 => true,
+  67832 => true,
+  67833 => true,
+  67834 => true,
+  67868 => true,
+  67869 => true,
+  67870 => true,
+  67898 => true,
+  67899 => true,
+  67900 => true,
+  67901 => true,
+  67902 => true,
+  68024 => true,
+  68025 => true,
+  68026 => true,
+  68027 => true,
+  68048 => true,
+  68049 => true,
+  68100 => true,
+  68103 => true,
+  68104 => true,
+  68105 => true,
+  68106 => true,
+  68107 => true,
+  68116 => true,
+  68120 => true,
+  68150 => true,
+  68151 => true,
+  68155 => true,
+  68156 => true,
+  68157 => true,
+  68158 => true,
+  68169 => true,
+  68170 => true,
+  68171 => true,
+  68172 => true,
+  68173 => true,
+  68174 => true,
+  68175 => true,
+  68185 => true,
+  68186 => true,
+  68187 => true,
+  68188 => true,
+  68189 => true,
+  68190 => true,
+  68191 => true,
+  68327 => true,
+  68328 => true,
+  68329 => true,
+  68330 => true,
+  68343 => true,
+  68344 => true,
+  68345 => true,
+  68346 => true,
+  68347 => true,
+  68348 => true,
+  68349 => true,
+  68350 => true,
+  68351 => true,
+  68406 => true,
+  68407 => true,
+  68408 => true,
+  68438 => true,
+  68439 => true,
+  68467 => true,
+  68468 => true,
+  68469 => true,
+  68470 => true,
+  68471 => true,
+  68498 => true,
+  68499 => true,
+  68500 => true,
+  68501 => true,
+  68502 => true,
+  68503 => true,
+  68504 => true,
+  68509 => true,
+  68510 => true,
+  68511 => true,
+  68512 => true,
+  68513 => true,
+  68514 => true,
+  68515 => true,
+  68516 => true,
+  68517 => true,
+  68518 => true,
+  68519 => true,
+  68520 => true,
+  68787 => true,
+  68788 => true,
+  68789 => true,
+  68790 => true,
+  68791 => true,
+  68792 => true,
+  68793 => true,
+  68794 => true,
+  68795 => true,
+  68796 => true,
+  68797 => true,
+  68798 => true,
+  68799 => true,
+  68851 => true,
+  68852 => true,
+  68853 => true,
+  68854 => true,
+  68855 => true,
+  68856 => true,
+  68857 => true,
+  68904 => true,
+  68905 => true,
+  68906 => true,
+  68907 => true,
+  68908 => true,
+  68909 => true,
+  68910 => true,
+  68911 => true,
+  69247 => true,
+  69290 => true,
+  69294 => true,
+  69295 => true,
+  69416 => true,
+  69417 => true,
+  69418 => true,
+  69419 => true,
+  69420 => true,
+  69421 => true,
+  69422 => true,
+  69423 => true,
+  69580 => true,
+  69581 => true,
+  69582 => true,
+  69583 => true,
+  69584 => true,
+  69585 => true,
+  69586 => true,
+  69587 => true,
+  69588 => true,
+  69589 => true,
+  69590 => true,
+  69591 => true,
+  69592 => true,
+  69593 => true,
+  69594 => true,
+  69595 => true,
+  69596 => true,
+  69597 => true,
+  69598 => true,
+  69599 => true,
+  69623 => true,
+  69624 => true,
+  69625 => true,
+  69626 => true,
+  69627 => true,
+  69628 => true,
+  69629 => true,
+  69630 => true,
+  69631 => true,
+  69710 => true,
+  69711 => true,
+  69712 => true,
+  69713 => true,
+  69744 => true,
+  69745 => true,
+  69746 => true,
+  69747 => true,
+  69748 => true,
+  69749 => true,
+  69750 => true,
+  69751 => true,
+  69752 => true,
+  69753 => true,
+  69754 => true,
+  69755 => true,
+  69756 => true,
+  69757 => true,
+  69758 => true,
+  69821 => true,
+  69826 => true,
+  69827 => true,
+  69828 => true,
+  69829 => true,
+  69830 => true,
+  69831 => true,
+  69832 => true,
+  69833 => true,
+  69834 => true,
+  69835 => true,
+  69836 => true,
+  69837 => true,
+  69838 => true,
+  69839 => true,
+  69865 => true,
+  69866 => true,
+  69867 => true,
+  69868 => true,
+  69869 => true,
+  69870 => true,
+  69871 => true,
+  69882 => true,
+  69883 => true,
+  69884 => true,
+  69885 => true,
+  69886 => true,
+  69887 => true,
+  69941 => true,
+  69960 => true,
+  69961 => true,
+  69962 => true,
+  69963 => true,
+  69964 => true,
+  69965 => true,
+  69966 => true,
+  69967 => true,
+  70007 => true,
+  70008 => true,
+  70009 => true,
+  70010 => true,
+  70011 => true,
+  70012 => true,
+  70013 => true,
+  70014 => true,
+  70015 => true,
+  70112 => true,
+  70133 => true,
+  70134 => true,
+  70135 => true,
+  70136 => true,
+  70137 => true,
+  70138 => true,
+  70139 => true,
+  70140 => true,
+  70141 => true,
+  70142 => true,
+  70143 => true,
+  70162 => true,
+  70279 => true,
+  70281 => true,
+  70286 => true,
+  70302 => true,
+  70314 => true,
+  70315 => true,
+  70316 => true,
+  70317 => true,
+  70318 => true,
+  70319 => true,
+  70379 => true,
+  70380 => true,
+  70381 => true,
+  70382 => true,
+  70383 => true,
+  70394 => true,
+  70395 => true,
+  70396 => true,
+  70397 => true,
+  70398 => true,
+  70399 => true,
+  70404 => true,
+  70413 => true,
+  70414 => true,
+  70417 => true,
+  70418 => true,
+  70441 => true,
+  70449 => true,
+  70452 => true,
+  70458 => true,
+  70469 => true,
+  70470 => true,
+  70473 => true,
+  70474 => true,
+  70478 => true,
+  70479 => true,
+  70481 => true,
+  70482 => true,
+  70483 => true,
+  70484 => true,
+  70485 => true,
+  70486 => true,
+  70488 => true,
+  70489 => true,
+  70490 => true,
+  70491 => true,
+  70492 => true,
+  70500 => true,
+  70501 => true,
+  70509 => true,
+  70510 => true,
+  70511 => true,
+  70748 => true,
+  70754 => true,
+  70755 => true,
+  70756 => true,
+  70757 => true,
+  70758 => true,
+  70759 => true,
+  70760 => true,
+  70761 => true,
+  70762 => true,
+  70763 => true,
+  70764 => true,
+  70765 => true,
+  70766 => true,
+  70767 => true,
+  70768 => true,
+  70769 => true,
+  70770 => true,
+  70771 => true,
+  70772 => true,
+  70773 => true,
+  70774 => true,
+  70775 => true,
+  70776 => true,
+  70777 => true,
+  70778 => true,
+  70779 => true,
+  70780 => true,
+  70781 => true,
+  70782 => true,
+  70783 => true,
+  70856 => true,
+  70857 => true,
+  70858 => true,
+  70859 => true,
+  70860 => true,
+  70861 => true,
+  70862 => true,
+  70863 => true,
+  71094 => true,
+  71095 => true,
+  71237 => true,
+  71238 => true,
+  71239 => true,
+  71240 => true,
+  71241 => true,
+  71242 => true,
+  71243 => true,
+  71244 => true,
+  71245 => true,
+  71246 => true,
+  71247 => true,
+  71258 => true,
+  71259 => true,
+  71260 => true,
+  71261 => true,
+  71262 => true,
+  71263 => true,
+  71277 => true,
+  71278 => true,
+  71279 => true,
+  71280 => true,
+  71281 => true,
+  71282 => true,
+  71283 => true,
+  71284 => true,
+  71285 => true,
+  71286 => true,
+  71287 => true,
+  71288 => true,
+  71289 => true,
+  71290 => true,
+  71291 => true,
+  71292 => true,
+  71293 => true,
+  71294 => true,
+  71295 => true,
+  71353 => true,
+  71354 => true,
+  71355 => true,
+  71356 => true,
+  71357 => true,
+  71358 => true,
+  71359 => true,
+  71451 => true,
+  71452 => true,
+  71468 => true,
+  71469 => true,
+  71470 => true,
+  71471 => true,
+  71923 => true,
+  71924 => true,
+  71925 => true,
+  71926 => true,
+  71927 => true,
+  71928 => true,
+  71929 => true,
+  71930 => true,
+  71931 => true,
+  71932 => true,
+  71933 => true,
+  71934 => true,
+  71943 => true,
+  71944 => true,
+  71946 => true,
+  71947 => true,
+  71956 => true,
+  71959 => true,
+  71990 => true,
+  71993 => true,
+  71994 => true,
+  72007 => true,
+  72008 => true,
+  72009 => true,
+  72010 => true,
+  72011 => true,
+  72012 => true,
+  72013 => true,
+  72014 => true,
+  72015 => true,
+  72104 => true,
+  72105 => true,
+  72152 => true,
+  72153 => true,
+  72165 => true,
+  72166 => true,
+  72167 => true,
+  72168 => true,
+  72169 => true,
+  72170 => true,
+  72171 => true,
+  72172 => true,
+  72173 => true,
+  72174 => true,
+  72175 => true,
+  72176 => true,
+  72177 => true,
+  72178 => true,
+  72179 => true,
+  72180 => true,
+  72181 => true,
+  72182 => true,
+  72183 => true,
+  72184 => true,
+  72185 => true,
+  72186 => true,
+  72187 => true,
+  72188 => true,
+  72189 => true,
+  72190 => true,
+  72191 => true,
+  72264 => true,
+  72265 => true,
+  72266 => true,
+  72267 => true,
+  72268 => true,
+  72269 => true,
+  72270 => true,
+  72271 => true,
+  72355 => true,
+  72356 => true,
+  72357 => true,
+  72358 => true,
+  72359 => true,
+  72360 => true,
+  72361 => true,
+  72362 => true,
+  72363 => true,
+  72364 => true,
+  72365 => true,
+  72366 => true,
+  72367 => true,
+  72368 => true,
+  72369 => true,
+  72370 => true,
+  72371 => true,
+  72372 => true,
+  72373 => true,
+  72374 => true,
+  72375 => true,
+  72376 => true,
+  72377 => true,
+  72378 => true,
+  72379 => true,
+  72380 => true,
+  72381 => true,
+  72382 => true,
+  72383 => true,
+  72713 => true,
+  72759 => true,
+  72774 => true,
+  72775 => true,
+  72776 => true,
+  72777 => true,
+  72778 => true,
+  72779 => true,
+  72780 => true,
+  72781 => true,
+  72782 => true,
+  72783 => true,
+  72813 => true,
+  72814 => true,
+  72815 => true,
+  72848 => true,
+  72849 => true,
+  72872 => true,
+  72967 => true,
+  72970 => true,
+  73015 => true,
+  73016 => true,
+  73017 => true,
+  73019 => true,
+  73022 => true,
+  73032 => true,
+  73033 => true,
+  73034 => true,
+  73035 => true,
+  73036 => true,
+  73037 => true,
+  73038 => true,
+  73039 => true,
+  73050 => true,
+  73051 => true,
+  73052 => true,
+  73053 => true,
+  73054 => true,
+  73055 => true,
+  73062 => true,
+  73065 => true,
+  73103 => true,
+  73106 => true,
+  73113 => true,
+  73114 => true,
+  73115 => true,
+  73116 => true,
+  73117 => true,
+  73118 => true,
+  73119 => true,
+  73649 => true,
+  73650 => true,
+  73651 => true,
+  73652 => true,
+  73653 => true,
+  73654 => true,
+  73655 => true,
+  73656 => true,
+  73657 => true,
+  73658 => true,
+  73659 => true,
+  73660 => true,
+  73661 => true,
+  73662 => true,
+  73663 => true,
+  73714 => true,
+  73715 => true,
+  73716 => true,
+  73717 => true,
+  73718 => true,
+  73719 => true,
+  73720 => true,
+  73721 => true,
+  73722 => true,
+  73723 => true,
+  73724 => true,
+  73725 => true,
+  73726 => true,
+  74863 => true,
+  74869 => true,
+  74870 => true,
+  74871 => true,
+  74872 => true,
+  74873 => true,
+  74874 => true,
+  74875 => true,
+  74876 => true,
+  74877 => true,
+  74878 => true,
+  74879 => true,
+  78895 => true,
+  78896 => true,
+  78897 => true,
+  78898 => true,
+  78899 => true,
+  78900 => true,
+  78901 => true,
+  78902 => true,
+  78903 => true,
+  78904 => true,
+  92729 => true,
+  92730 => true,
+  92731 => true,
+  92732 => true,
+  92733 => true,
+  92734 => true,
+  92735 => true,
+  92767 => true,
+  92778 => true,
+  92779 => true,
+  92780 => true,
+  92781 => true,
+  92910 => true,
+  92911 => true,
+  92918 => true,
+  92919 => true,
+  92920 => true,
+  92921 => true,
+  92922 => true,
+  92923 => true,
+  92924 => true,
+  92925 => true,
+  92926 => true,
+  92927 => true,
+  92998 => true,
+  92999 => true,
+  93000 => true,
+  93001 => true,
+  93002 => true,
+  93003 => true,
+  93004 => true,
+  93005 => true,
+  93006 => true,
+  93007 => true,
+  93018 => true,
+  93026 => true,
+  93048 => true,
+  93049 => true,
+  93050 => true,
+  93051 => true,
+  93052 => true,
+  94027 => true,
+  94028 => true,
+  94029 => true,
+  94030 => true,
+  94088 => true,
+  94089 => true,
+  94090 => true,
+  94091 => true,
+  94092 => true,
+  94093 => true,
+  94094 => true,
+  94181 => true,
+  94182 => true,
+  94183 => true,
+  94184 => true,
+  94185 => true,
+  94186 => true,
+  94187 => true,
+  94188 => true,
+  94189 => true,
+  94190 => true,
+  94191 => true,
+  94194 => true,
+  94195 => true,
+  94196 => true,
+  94197 => true,
+  94198 => true,
+  94199 => true,
+  94200 => true,
+  94201 => true,
+  94202 => true,
+  94203 => true,
+  94204 => true,
+  94205 => true,
+  94206 => true,
+  94207 => true,
+  100344 => true,
+  100345 => true,
+  100346 => true,
+  100347 => true,
+  100348 => true,
+  100349 => true,
+  100350 => true,
+  100351 => true,
+  110931 => true,
+  110932 => true,
+  110933 => true,
+  110934 => true,
+  110935 => true,
+  110936 => true,
+  110937 => true,
+  110938 => true,
+  110939 => true,
+  110940 => true,
+  110941 => true,
+  110942 => true,
+  110943 => true,
+  110944 => true,
+  110945 => true,
+  110946 => true,
+  110947 => true,
+  110952 => true,
+  110953 => true,
+  110954 => true,
+  110955 => true,
+  110956 => true,
+  110957 => true,
+  110958 => true,
+  110959 => true,
+  113771 => true,
+  113772 => true,
+  113773 => true,
+  113774 => true,
+  113775 => true,
+  113789 => true,
+  113790 => true,
+  113791 => true,
+  113801 => true,
+  113802 => true,
+  113803 => true,
+  113804 => true,
+  113805 => true,
+  113806 => true,
+  113807 => true,
+  113818 => true,
+  113819 => true,
+  119030 => true,
+  119031 => true,
+  119032 => true,
+  119033 => true,
+  119034 => true,
+  119035 => true,
+  119036 => true,
+  119037 => true,
+  119038 => true,
+  119039 => true,
+  119079 => true,
+  119080 => true,
+  119155 => true,
+  119156 => true,
+  119157 => true,
+  119158 => true,
+  119159 => true,
+  119160 => true,
+  119161 => true,
+  119162 => true,
+  119273 => true,
+  119274 => true,
+  119275 => true,
+  119276 => true,
+  119277 => true,
+  119278 => true,
+  119279 => true,
+  119280 => true,
+  119281 => true,
+  119282 => true,
+  119283 => true,
+  119284 => true,
+  119285 => true,
+  119286 => true,
+  119287 => true,
+  119288 => true,
+  119289 => true,
+  119290 => true,
+  119291 => true,
+  119292 => true,
+  119293 => true,
+  119294 => true,
+  119295 => true,
+  119540 => true,
+  119541 => true,
+  119542 => true,
+  119543 => true,
+  119544 => true,
+  119545 => true,
+  119546 => true,
+  119547 => true,
+  119548 => true,
+  119549 => true,
+  119550 => true,
+  119551 => true,
+  119639 => true,
+  119640 => true,
+  119641 => true,
+  119642 => true,
+  119643 => true,
+  119644 => true,
+  119645 => true,
+  119646 => true,
+  119647 => true,
+  119893 => true,
+  119965 => true,
+  119968 => true,
+  119969 => true,
+  119971 => true,
+  119972 => true,
+  119975 => true,
+  119976 => true,
+  119981 => true,
+  119994 => true,
+  119996 => true,
+  120004 => true,
+  120070 => true,
+  120075 => true,
+  120076 => true,
+  120085 => true,
+  120093 => true,
+  120122 => true,
+  120127 => true,
+  120133 => true,
+  120135 => true,
+  120136 => true,
+  120137 => true,
+  120145 => true,
+  120486 => true,
+  120487 => true,
+  120780 => true,
+  120781 => true,
+  121484 => true,
+  121485 => true,
+  121486 => true,
+  121487 => true,
+  121488 => true,
+  121489 => true,
+  121490 => true,
+  121491 => true,
+  121492 => true,
+  121493 => true,
+  121494 => true,
+  121495 => true,
+  121496 => true,
+  121497 => true,
+  121498 => true,
+  121504 => true,
+  122887 => true,
+  122905 => true,
+  122906 => true,
+  122914 => true,
+  122917 => true,
+  123181 => true,
+  123182 => true,
+  123183 => true,
+  123198 => true,
+  123199 => true,
+  123210 => true,
+  123211 => true,
+  123212 => true,
+  123213 => true,
+  123642 => true,
+  123643 => true,
+  123644 => true,
+  123645 => true,
+  123646 => true,
+  125125 => true,
+  125126 => true,
+  125260 => true,
+  125261 => true,
+  125262 => true,
+  125263 => true,
+  125274 => true,
+  125275 => true,
+  125276 => true,
+  125277 => true,
+  126468 => true,
+  126496 => true,
+  126499 => true,
+  126501 => true,
+  126502 => true,
+  126504 => true,
+  126515 => true,
+  126520 => true,
+  126522 => true,
+  126524 => true,
+  126525 => true,
+  126526 => true,
+  126527 => true,
+  126528 => true,
+  126529 => true,
+  126531 => true,
+  126532 => true,
+  126533 => true,
+  126534 => true,
+  126536 => true,
+  126538 => true,
+  126540 => true,
+  126544 => true,
+  126547 => true,
+  126549 => true,
+  126550 => true,
+  126552 => true,
+  126554 => true,
+  126556 => true,
+  126558 => true,
+  126560 => true,
+  126563 => true,
+  126565 => true,
+  126566 => true,
+  126571 => true,
+  126579 => true,
+  126584 => true,
+  126589 => true,
+  126591 => true,
+  126602 => true,
+  126620 => true,
+  126621 => true,
+  126622 => true,
+  126623 => true,
+  126624 => true,
+  126628 => true,
+  126634 => true,
+  127020 => true,
+  127021 => true,
+  127022 => true,
+  127023 => true,
+  127124 => true,
+  127125 => true,
+  127126 => true,
+  127127 => true,
+  127128 => true,
+  127129 => true,
+  127130 => true,
+  127131 => true,
+  127132 => true,
+  127133 => true,
+  127134 => true,
+  127135 => true,
+  127151 => true,
+  127152 => true,
+  127168 => true,
+  127184 => true,
+  127222 => true,
+  127223 => true,
+  127224 => true,
+  127225 => true,
+  127226 => true,
+  127227 => true,
+  127228 => true,
+  127229 => true,
+  127230 => true,
+  127231 => true,
+  127232 => true,
+  127491 => true,
+  127492 => true,
+  127493 => true,
+  127494 => true,
+  127495 => true,
+  127496 => true,
+  127497 => true,
+  127498 => true,
+  127499 => true,
+  127500 => true,
+  127501 => true,
+  127502 => true,
+  127503 => true,
+  127548 => true,
+  127549 => true,
+  127550 => true,
+  127551 => true,
+  127561 => true,
+  127562 => true,
+  127563 => true,
+  127564 => true,
+  127565 => true,
+  127566 => true,
+  127567 => true,
+  127570 => true,
+  127571 => true,
+  127572 => true,
+  127573 => true,
+  127574 => true,
+  127575 => true,
+  127576 => true,
+  127577 => true,
+  127578 => true,
+  127579 => true,
+  127580 => true,
+  127581 => true,
+  127582 => true,
+  127583 => true,
+  128728 => true,
+  128729 => true,
+  128730 => true,
+  128731 => true,
+  128732 => true,
+  128733 => true,
+  128734 => true,
+  128735 => true,
+  128749 => true,
+  128750 => true,
+  128751 => true,
+  128765 => true,
+  128766 => true,
+  128767 => true,
+  128884 => true,
+  128885 => true,
+  128886 => true,
+  128887 => true,
+  128888 => true,
+  128889 => true,
+  128890 => true,
+  128891 => true,
+  128892 => true,
+  128893 => true,
+  128894 => true,
+  128895 => true,
+  128985 => true,
+  128986 => true,
+  128987 => true,
+  128988 => true,
+  128989 => true,
+  128990 => true,
+  128991 => true,
+  129004 => true,
+  129005 => true,
+  129006 => true,
+  129007 => true,
+  129008 => true,
+  129009 => true,
+  129010 => true,
+  129011 => true,
+  129012 => true,
+  129013 => true,
+  129014 => true,
+  129015 => true,
+  129016 => true,
+  129017 => true,
+  129018 => true,
+  129019 => true,
+  129020 => true,
+  129021 => true,
+  129022 => true,
+  129023 => true,
+  129036 => true,
+  129037 => true,
+  129038 => true,
+  129039 => true,
+  129096 => true,
+  129097 => true,
+  129098 => true,
+  129099 => true,
+  129100 => true,
+  129101 => true,
+  129102 => true,
+  129103 => true,
+  129114 => true,
+  129115 => true,
+  129116 => true,
+  129117 => true,
+  129118 => true,
+  129119 => true,
+  129160 => true,
+  129161 => true,
+  129162 => true,
+  129163 => true,
+  129164 => true,
+  129165 => true,
+  129166 => true,
+  129167 => true,
+  129198 => true,
+  129199 => true,
+  129401 => true,
+  129484 => true,
+  129620 => true,
+  129621 => true,
+  129622 => true,
+  129623 => true,
+  129624 => true,
+  129625 => true,
+  129626 => true,
+  129627 => true,
+  129628 => true,
+  129629 => true,
+  129630 => true,
+  129631 => true,
+  129646 => true,
+  129647 => true,
+  129653 => true,
+  129654 => true,
+  129655 => true,
+  129659 => true,
+  129660 => true,
+  129661 => true,
+  129662 => true,
+  129663 => true,
+  129671 => true,
+  129672 => true,
+  129673 => true,
+  129674 => true,
+  129675 => true,
+  129676 => true,
+  129677 => true,
+  129678 => true,
+  129679 => true,
+  129705 => true,
+  129706 => true,
+  129707 => true,
+  129708 => true,
+  129709 => true,
+  129710 => true,
+  129711 => true,
+  129719 => true,
+  129720 => true,
+  129721 => true,
+  129722 => true,
+  129723 => true,
+  129724 => true,
+  129725 => true,
+  129726 => true,
+  129727 => true,
+  129731 => true,
+  129732 => true,
+  129733 => true,
+  129734 => true,
+  129735 => true,
+  129736 => true,
+  129737 => true,
+  129738 => true,
+  129739 => true,
+  129740 => true,
+  129741 => true,
+  129742 => true,
+  129743 => true,
+  129939 => true,
+  131070 => true,
+  131071 => true,
+  177973 => true,
+  177974 => true,
+  177975 => true,
+  177976 => true,
+  177977 => true,
+  177978 => true,
+  177979 => true,
+  177980 => true,
+  177981 => true,
+  177982 => true,
+  177983 => true,
+  178206 => true,
+  178207 => true,
+  183970 => true,
+  183971 => true,
+  183972 => true,
+  183973 => true,
+  183974 => true,
+  183975 => true,
+  183976 => true,
+  183977 => true,
+  183978 => true,
+  183979 => true,
+  183980 => true,
+  183981 => true,
+  183982 => true,
+  183983 => true,
+  194664 => true,
+  194676 => true,
+  194847 => true,
+  194911 => true,
+  195007 => true,
+  196606 => true,
+  196607 => true,
+  262142 => true,
+  262143 => true,
+  327678 => true,
+  327679 => true,
+  393214 => true,
+  393215 => true,
+  458750 => true,
+  458751 => true,
+  524286 => true,
+  524287 => true,
+  589822 => true,
+  589823 => true,
+  655358 => true,
+  655359 => true,
+  720894 => true,
+  720895 => true,
+  786430 => true,
+  786431 => true,
+  851966 => true,
+  851967 => true,
+  917502 => true,
+  917503 => true,
+  917504 => true,
+  917505 => true,
+  917506 => true,
+  917507 => true,
+  917508 => true,
+  917509 => true,
+  917510 => true,
+  917511 => true,
+  917512 => true,
+  917513 => true,
+  917514 => true,
+  917515 => true,
+  917516 => true,
+  917517 => true,
+  917518 => true,
+  917519 => true,
+  917520 => true,
+  917521 => true,
+  917522 => true,
+  917523 => true,
+  917524 => true,
+  917525 => true,
+  917526 => true,
+  917527 => true,
+  917528 => true,
+  917529 => true,
+  917530 => true,
+  917531 => true,
+  917532 => true,
+  917533 => true,
+  917534 => true,
+  917535 => true,
+  983038 => true,
+  983039 => true,
+  1048574 => true,
+  1048575 => true,
+  1114110 => true,
+  1114111 => true,
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php
new file mode 100644
index 000000000..54f21cc0c
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php
@@ -0,0 +1,308 @@
+<?php
+
+return array (
+  160 => ' ',
+  168 => ' ̈',
+  175 => ' ̄',
+  180 => ' ́',
+  184 => ' ̧',
+  728 => ' ̆',
+  729 => ' ̇',
+  730 => ' ̊',
+  731 => ' ̨',
+  732 => ' ̃',
+  733 => ' ̋',
+  890 => ' ι',
+  894 => ';',
+  900 => ' ́',
+  901 => ' ̈́',
+  8125 => ' ̓',
+  8127 => ' ̓',
+  8128 => ' ͂',
+  8129 => ' ̈͂',
+  8141 => ' ̓̀',
+  8142 => ' ̓́',
+  8143 => ' ̓͂',
+  8157 => ' ̔̀',
+  8158 => ' ̔́',
+  8159 => ' ̔͂',
+  8173 => ' ̈̀',
+  8174 => ' ̈́',
+  8175 => '`',
+  8189 => ' ́',
+  8190 => ' ̔',
+  8192 => ' ',
+  8193 => ' ',
+  8194 => ' ',
+  8195 => ' ',
+  8196 => ' ',
+  8197 => ' ',
+  8198 => ' ',
+  8199 => ' ',
+  8200 => ' ',
+  8201 => ' ',
+  8202 => ' ',
+  8215 => ' ̳',
+  8239 => ' ',
+  8252 => '!!',
+  8254 => ' ̅',
+  8263 => '??',
+  8264 => '?!',
+  8265 => '!?',
+  8287 => ' ',
+  8314 => '+',
+  8316 => '=',
+  8317 => '(',
+  8318 => ')',
+  8330 => '+',
+  8332 => '=',
+  8333 => '(',
+  8334 => ')',
+  8448 => 'a/c',
+  8449 => 'a/s',
+  8453 => 'c/o',
+  8454 => 'c/u',
+  9332 => '(1)',
+  9333 => '(2)',
+  9334 => '(3)',
+  9335 => '(4)',
+  9336 => '(5)',
+  9337 => '(6)',
+  9338 => '(7)',
+  9339 => '(8)',
+  9340 => '(9)',
+  9341 => '(10)',
+  9342 => '(11)',
+  9343 => '(12)',
+  9344 => '(13)',
+  9345 => '(14)',
+  9346 => '(15)',
+  9347 => '(16)',
+  9348 => '(17)',
+  9349 => '(18)',
+  9350 => '(19)',
+  9351 => '(20)',
+  9372 => '(a)',
+  9373 => '(b)',
+  9374 => '(c)',
+  9375 => '(d)',
+  9376 => '(e)',
+  9377 => '(f)',
+  9378 => '(g)',
+  9379 => '(h)',
+  9380 => '(i)',
+  9381 => '(j)',
+  9382 => '(k)',
+  9383 => '(l)',
+  9384 => '(m)',
+  9385 => '(n)',
+  9386 => '(o)',
+  9387 => '(p)',
+  9388 => '(q)',
+  9389 => '(r)',
+  9390 => '(s)',
+  9391 => '(t)',
+  9392 => '(u)',
+  9393 => '(v)',
+  9394 => '(w)',
+  9395 => '(x)',
+  9396 => '(y)',
+  9397 => '(z)',
+  10868 => '::=',
+  10869 => '==',
+  10870 => '===',
+  12288 => ' ',
+  12443 => ' ゙',
+  12444 => ' ゚',
+  12800 => '(ᄀ)',
+  12801 => '(ᄂ)',
+  12802 => '(ᄃ)',
+  12803 => '(ᄅ)',
+  12804 => '(ᄆ)',
+  12805 => '(ᄇ)',
+  12806 => '(ᄉ)',
+  12807 => '(ᄋ)',
+  12808 => '(ᄌ)',
+  12809 => '(ᄎ)',
+  12810 => '(ᄏ)',
+  12811 => '(ᄐ)',
+  12812 => '(ᄑ)',
+  12813 => '(ᄒ)',
+  12814 => '(가)',
+  12815 => '(나)',
+  12816 => '(다)',
+  12817 => '(라)',
+  12818 => '(마)',
+  12819 => '(바)',
+  12820 => '(사)',
+  12821 => '(아)',
+  12822 => '(자)',
+  12823 => '(차)',
+  12824 => '(카)',
+  12825 => '(타)',
+  12826 => '(파)',
+  12827 => '(하)',
+  12828 => '(주)',
+  12829 => '(오전)',
+  12830 => '(오후)',
+  12832 => '(一)',
+  12833 => '(二)',
+  12834 => '(三)',
+  12835 => '(四)',
+  12836 => '(五)',
+  12837 => '(六)',
+  12838 => '(七)',
+  12839 => '(八)',
+  12840 => '(九)',
+  12841 => '(十)',
+  12842 => '(月)',
+  12843 => '(火)',
+  12844 => '(水)',
+  12845 => '(木)',
+  12846 => '(金)',
+  12847 => '(土)',
+  12848 => '(日)',
+  12849 => '(株)',
+  12850 => '(有)',
+  12851 => '(社)',
+  12852 => '(名)',
+  12853 => '(特)',
+  12854 => '(財)',
+  12855 => '(祝)',
+  12856 => '(労)',
+  12857 => '(代)',
+  12858 => '(呼)',
+  12859 => '(学)',
+  12860 => '(監)',
+  12861 => '(企)',
+  12862 => '(資)',
+  12863 => '(協)',
+  12864 => '(祭)',
+  12865 => '(休)',
+  12866 => '(自)',
+  12867 => '(至)',
+  64297 => '+',
+  64606 => ' ٌّ',
+  64607 => ' ٍّ',
+  64608 => ' َّ',
+  64609 => ' ُّ',
+  64610 => ' ِّ',
+  64611 => ' ّٰ',
+  65018 => 'صلى الله عليه وسلم',
+  65019 => 'جل جلاله',
+  65040 => ',',
+  65043 => ':',
+  65044 => ';',
+  65045 => '!',
+  65046 => '?',
+  65075 => '_',
+  65076 => '_',
+  65077 => '(',
+  65078 => ')',
+  65079 => '{',
+  65080 => '}',
+  65095 => '[',
+  65096 => ']',
+  65097 => ' ̅',
+  65098 => ' ̅',
+  65099 => ' ̅',
+  65100 => ' ̅',
+  65101 => '_',
+  65102 => '_',
+  65103 => '_',
+  65104 => ',',
+  65108 => ';',
+  65109 => ':',
+  65110 => '?',
+  65111 => '!',
+  65113 => '(',
+  65114 => ')',
+  65115 => '{',
+  65116 => '}',
+  65119 => '#',
+  65120 => '&',
+  65121 => '*',
+  65122 => '+',
+  65124 => '<',
+  65125 => '>',
+  65126 => '=',
+  65128 => '\\',
+  65129 => '$',
+  65130 => '%',
+  65131 => '@',
+  65136 => ' ً',
+  65138 => ' ٌ',
+  65140 => ' ٍ',
+  65142 => ' َ',
+  65144 => ' ُ',
+  65146 => ' ِ',
+  65148 => ' ّ',
+  65150 => ' ْ',
+  65281 => '!',
+  65282 => '"',
+  65283 => '#',
+  65284 => '$',
+  65285 => '%',
+  65286 => '&',
+  65287 => '\'',
+  65288 => '(',
+  65289 => ')',
+  65290 => '*',
+  65291 => '+',
+  65292 => ',',
+  65295 => '/',
+  65306 => ':',
+  65307 => ';',
+  65308 => '<',
+  65309 => '=',
+  65310 => '>',
+  65311 => '?',
+  65312 => '@',
+  65339 => '[',
+  65340 => '\\',
+  65341 => ']',
+  65342 => '^',
+  65343 => '_',
+  65344 => '`',
+  65371 => '{',
+  65372 => '|',
+  65373 => '}',
+  65374 => '~',
+  65507 => ' ̄',
+  127233 => '0,',
+  127234 => '1,',
+  127235 => '2,',
+  127236 => '3,',
+  127237 => '4,',
+  127238 => '5,',
+  127239 => '6,',
+  127240 => '7,',
+  127241 => '8,',
+  127242 => '9,',
+  127248 => '(a)',
+  127249 => '(b)',
+  127250 => '(c)',
+  127251 => '(d)',
+  127252 => '(e)',
+  127253 => '(f)',
+  127254 => '(g)',
+  127255 => '(h)',
+  127256 => '(i)',
+  127257 => '(j)',
+  127258 => '(k)',
+  127259 => '(l)',
+  127260 => '(m)',
+  127261 => '(n)',
+  127262 => '(o)',
+  127263 => '(p)',
+  127264 => '(q)',
+  127265 => '(r)',
+  127266 => '(s)',
+  127267 => '(t)',
+  127268 => '(u)',
+  127269 => '(v)',
+  127270 => '(w)',
+  127271 => '(x)',
+  127272 => '(y)',
+  127273 => '(z)',
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php
new file mode 100644
index 000000000..223396ec4
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php
@@ -0,0 +1,71 @@
+<?php
+
+return array (
+  0 => true,
+  1 => true,
+  2 => true,
+  3 => true,
+  4 => true,
+  5 => true,
+  6 => true,
+  7 => true,
+  8 => true,
+  9 => true,
+  10 => true,
+  11 => true,
+  12 => true,
+  13 => true,
+  14 => true,
+  15 => true,
+  16 => true,
+  17 => true,
+  18 => true,
+  19 => true,
+  20 => true,
+  21 => true,
+  22 => true,
+  23 => true,
+  24 => true,
+  25 => true,
+  26 => true,
+  27 => true,
+  28 => true,
+  29 => true,
+  30 => true,
+  31 => true,
+  32 => true,
+  33 => true,
+  34 => true,
+  35 => true,
+  36 => true,
+  37 => true,
+  38 => true,
+  39 => true,
+  40 => true,
+  41 => true,
+  42 => true,
+  43 => true,
+  44 => true,
+  47 => true,
+  58 => true,
+  59 => true,
+  60 => true,
+  61 => true,
+  62 => true,
+  63 => true,
+  64 => true,
+  91 => true,
+  92 => true,
+  93 => true,
+  94 => true,
+  95 => true,
+  96 => true,
+  123 => true,
+  124 => true,
+  125 => true,
+  126 => true,
+  127 => true,
+  8800 => true,
+  8814 => true,
+  8815 => true,
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php
new file mode 100644
index 000000000..b37784413
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php
@@ -0,0 +1,273 @@
+<?php
+
+return array (
+  173 => true,
+  847 => true,
+  6155 => true,
+  6156 => true,
+  6157 => true,
+  8203 => true,
+  8288 => true,
+  8292 => true,
+  65024 => true,
+  65025 => true,
+  65026 => true,
+  65027 => true,
+  65028 => true,
+  65029 => true,
+  65030 => true,
+  65031 => true,
+  65032 => true,
+  65033 => true,
+  65034 => true,
+  65035 => true,
+  65036 => true,
+  65037 => true,
+  65038 => true,
+  65039 => true,
+  65279 => true,
+  113824 => true,
+  113825 => true,
+  113826 => true,
+  113827 => true,
+  917760 => true,
+  917761 => true,
+  917762 => true,
+  917763 => true,
+  917764 => true,
+  917765 => true,
+  917766 => true,
+  917767 => true,
+  917768 => true,
+  917769 => true,
+  917770 => true,
+  917771 => true,
+  917772 => true,
+  917773 => true,
+  917774 => true,
+  917775 => true,
+  917776 => true,
+  917777 => true,
+  917778 => true,
+  917779 => true,
+  917780 => true,
+  917781 => true,
+  917782 => true,
+  917783 => true,
+  917784 => true,
+  917785 => true,
+  917786 => true,
+  917787 => true,
+  917788 => true,
+  917789 => true,
+  917790 => true,
+  917791 => true,
+  917792 => true,
+  917793 => true,
+  917794 => true,
+  917795 => true,
+  917796 => true,
+  917797 => true,
+  917798 => true,
+  917799 => true,
+  917800 => true,
+  917801 => true,
+  917802 => true,
+  917803 => true,
+  917804 => true,
+  917805 => true,
+  917806 => true,
+  917807 => true,
+  917808 => true,
+  917809 => true,
+  917810 => true,
+  917811 => true,
+  917812 => true,
+  917813 => true,
+  917814 => true,
+  917815 => true,
+  917816 => true,
+  917817 => true,
+  917818 => true,
+  917819 => true,
+  917820 => true,
+  917821 => true,
+  917822 => true,
+  917823 => true,
+  917824 => true,
+  917825 => true,
+  917826 => true,
+  917827 => true,
+  917828 => true,
+  917829 => true,
+  917830 => true,
+  917831 => true,
+  917832 => true,
+  917833 => true,
+  917834 => true,
+  917835 => true,
+  917836 => true,
+  917837 => true,
+  917838 => true,
+  917839 => true,
+  917840 => true,
+  917841 => true,
+  917842 => true,
+  917843 => true,
+  917844 => true,
+  917845 => true,
+  917846 => true,
+  917847 => true,
+  917848 => true,
+  917849 => true,
+  917850 => true,
+  917851 => true,
+  917852 => true,
+  917853 => true,
+  917854 => true,
+  917855 => true,
+  917856 => true,
+  917857 => true,
+  917858 => true,
+  917859 => true,
+  917860 => true,
+  917861 => true,
+  917862 => true,
+  917863 => true,
+  917864 => true,
+  917865 => true,
+  917866 => true,
+  917867 => true,
+  917868 => true,
+  917869 => true,
+  917870 => true,
+  917871 => true,
+  917872 => true,
+  917873 => true,
+  917874 => true,
+  917875 => true,
+  917876 => true,
+  917877 => true,
+  917878 => true,
+  917879 => true,
+  917880 => true,
+  917881 => true,
+  917882 => true,
+  917883 => true,
+  917884 => true,
+  917885 => true,
+  917886 => true,
+  917887 => true,
+  917888 => true,
+  917889 => true,
+  917890 => true,
+  917891 => true,
+  917892 => true,
+  917893 => true,
+  917894 => true,
+  917895 => true,
+  917896 => true,
+  917897 => true,
+  917898 => true,
+  917899 => true,
+  917900 => true,
+  917901 => true,
+  917902 => true,
+  917903 => true,
+  917904 => true,
+  917905 => true,
+  917906 => true,
+  917907 => true,
+  917908 => true,
+  917909 => true,
+  917910 => true,
+  917911 => true,
+  917912 => true,
+  917913 => true,
+  917914 => true,
+  917915 => true,
+  917916 => true,
+  917917 => true,
+  917918 => true,
+  917919 => true,
+  917920 => true,
+  917921 => true,
+  917922 => true,
+  917923 => true,
+  917924 => true,
+  917925 => true,
+  917926 => true,
+  917927 => true,
+  917928 => true,
+  917929 => true,
+  917930 => true,
+  917931 => true,
+  917932 => true,
+  917933 => true,
+  917934 => true,
+  917935 => true,
+  917936 => true,
+  917937 => true,
+  917938 => true,
+  917939 => true,
+  917940 => true,
+  917941 => true,
+  917942 => true,
+  917943 => true,
+  917944 => true,
+  917945 => true,
+  917946 => true,
+  917947 => true,
+  917948 => true,
+  917949 => true,
+  917950 => true,
+  917951 => true,
+  917952 => true,
+  917953 => true,
+  917954 => true,
+  917955 => true,
+  917956 => true,
+  917957 => true,
+  917958 => true,
+  917959 => true,
+  917960 => true,
+  917961 => true,
+  917962 => true,
+  917963 => true,
+  917964 => true,
+  917965 => true,
+  917966 => true,
+  917967 => true,
+  917968 => true,
+  917969 => true,
+  917970 => true,
+  917971 => true,
+  917972 => true,
+  917973 => true,
+  917974 => true,
+  917975 => true,
+  917976 => true,
+  917977 => true,
+  917978 => true,
+  917979 => true,
+  917980 => true,
+  917981 => true,
+  917982 => true,
+  917983 => true,
+  917984 => true,
+  917985 => true,
+  917986 => true,
+  917987 => true,
+  917988 => true,
+  917989 => true,
+  917990 => true,
+  917991 => true,
+  917992 => true,
+  917993 => true,
+  917994 => true,
+  917995 => true,
+  917996 => true,
+  917997 => true,
+  917998 => true,
+  917999 => true,
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php
new file mode 100644
index 000000000..9b85fe9d3
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php
@@ -0,0 +1,5778 @@
+<?php
+
+return array (
+  65 => 'a',
+  66 => 'b',
+  67 => 'c',
+  68 => 'd',
+  69 => 'e',
+  70 => 'f',
+  71 => 'g',
+  72 => 'h',
+  73 => 'i',
+  74 => 'j',
+  75 => 'k',
+  76 => 'l',
+  77 => 'm',
+  78 => 'n',
+  79 => 'o',
+  80 => 'p',
+  81 => 'q',
+  82 => 'r',
+  83 => 's',
+  84 => 't',
+  85 => 'u',
+  86 => 'v',
+  87 => 'w',
+  88 => 'x',
+  89 => 'y',
+  90 => 'z',
+  170 => 'a',
+  178 => '2',
+  179 => '3',
+  181 => 'μ',
+  185 => '1',
+  186 => 'o',
+  188 => '1⁄4',
+  189 => '1⁄2',
+  190 => '3⁄4',
+  192 => 'à',
+  193 => 'á',
+  194 => 'â',
+  195 => 'ã',
+  196 => 'ä',
+  197 => 'å',
+  198 => 'æ',
+  199 => 'ç',
+  200 => 'è',
+  201 => 'é',
+  202 => 'ê',
+  203 => 'ë',
+  204 => 'ì',
+  205 => 'í',
+  206 => 'î',
+  207 => 'ï',
+  208 => 'ð',
+  209 => 'ñ',
+  210 => 'ò',
+  211 => 'ó',
+  212 => 'ô',
+  213 => 'õ',
+  214 => 'ö',
+  216 => 'ø',
+  217 => 'ù',
+  218 => 'ú',
+  219 => 'û',
+  220 => 'ü',
+  221 => 'ý',
+  222 => 'þ',
+  256 => 'ā',
+  258 => 'ă',
+  260 => 'ą',
+  262 => 'ć',
+  264 => 'ĉ',
+  266 => 'ċ',
+  268 => 'č',
+  270 => 'ď',
+  272 => 'đ',
+  274 => 'ē',
+  276 => 'ĕ',
+  278 => 'ė',
+  280 => 'ę',
+  282 => 'ě',
+  284 => 'ĝ',
+  286 => 'ğ',
+  288 => 'ġ',
+  290 => 'ģ',
+  292 => 'ĥ',
+  294 => 'ħ',
+  296 => 'ĩ',
+  298 => 'ī',
+  300 => 'ĭ',
+  302 => 'į',
+  304 => 'i̇',
+  306 => 'ij',
+  307 => 'ij',
+  308 => 'ĵ',
+  310 => 'ķ',
+  313 => 'ĺ',
+  315 => 'ļ',
+  317 => 'ľ',
+  319 => 'l·',
+  320 => 'l·',
+  321 => 'ł',
+  323 => 'ń',
+  325 => 'ņ',
+  327 => 'ň',
+  329 => 'ʼn',
+  330 => 'ŋ',
+  332 => 'ō',
+  334 => 'ŏ',
+  336 => 'ő',
+  338 => 'œ',
+  340 => 'ŕ',
+  342 => 'ŗ',
+  344 => 'ř',
+  346 => 'ś',
+  348 => 'ŝ',
+  350 => 'ş',
+  352 => 'š',
+  354 => 'ţ',
+  356 => 'ť',
+  358 => 'ŧ',
+  360 => 'ũ',
+  362 => 'ū',
+  364 => 'ŭ',
+  366 => 'ů',
+  368 => 'ű',
+  370 => 'ų',
+  372 => 'ŵ',
+  374 => 'ŷ',
+  376 => 'ÿ',
+  377 => 'ź',
+  379 => 'ż',
+  381 => 'ž',
+  383 => 's',
+  385 => 'ɓ',
+  386 => 'ƃ',
+  388 => 'ƅ',
+  390 => 'ɔ',
+  391 => 'ƈ',
+  393 => 'ɖ',
+  394 => 'ɗ',
+  395 => 'ƌ',
+  398 => 'ǝ',
+  399 => 'ə',
+  400 => 'ɛ',
+  401 => 'ƒ',
+  403 => 'ɠ',
+  404 => 'ɣ',
+  406 => 'ɩ',
+  407 => 'ɨ',
+  408 => 'ƙ',
+  412 => 'ɯ',
+  413 => 'ɲ',
+  415 => 'ɵ',
+  416 => 'ơ',
+  418 => 'ƣ',
+  420 => 'ƥ',
+  422 => 'ʀ',
+  423 => 'ƨ',
+  425 => 'ʃ',
+  428 => 'ƭ',
+  430 => 'ʈ',
+  431 => 'ư',
+  433 => 'ʊ',
+  434 => 'ʋ',
+  435 => 'ƴ',
+  437 => 'ƶ',
+  439 => 'ʒ',
+  440 => 'ƹ',
+  444 => 'ƽ',
+  452 => 'dž',
+  453 => 'dž',
+  454 => 'dž',
+  455 => 'lj',
+  456 => 'lj',
+  457 => 'lj',
+  458 => 'nj',
+  459 => 'nj',
+  460 => 'nj',
+  461 => 'ǎ',
+  463 => 'ǐ',
+  465 => 'ǒ',
+  467 => 'ǔ',
+  469 => 'ǖ',
+  471 => 'ǘ',
+  473 => 'ǚ',
+  475 => 'ǜ',
+  478 => 'ǟ',
+  480 => 'ǡ',
+  482 => 'ǣ',
+  484 => 'ǥ',
+  486 => 'ǧ',
+  488 => 'ǩ',
+  490 => 'ǫ',
+  492 => 'ǭ',
+  494 => 'ǯ',
+  497 => 'dz',
+  498 => 'dz',
+  499 => 'dz',
+  500 => 'ǵ',
+  502 => 'ƕ',
+  503 => 'ƿ',
+  504 => 'ǹ',
+  506 => 'ǻ',
+  508 => 'ǽ',
+  510 => 'ǿ',
+  512 => 'ȁ',
+  514 => 'ȃ',
+  516 => 'ȅ',
+  518 => 'ȇ',
+  520 => 'ȉ',
+  522 => 'ȋ',
+  524 => 'ȍ',
+  526 => 'ȏ',
+  528 => 'ȑ',
+  530 => 'ȓ',
+  532 => 'ȕ',
+  534 => 'ȗ',
+  536 => 'ș',
+  538 => 'ț',
+  540 => 'ȝ',
+  542 => 'ȟ',
+  544 => 'ƞ',
+  546 => 'ȣ',
+  548 => 'ȥ',
+  550 => 'ȧ',
+  552 => 'ȩ',
+  554 => 'ȫ',
+  556 => 'ȭ',
+  558 => 'ȯ',
+  560 => 'ȱ',
+  562 => 'ȳ',
+  570 => 'ⱥ',
+  571 => 'ȼ',
+  573 => 'ƚ',
+  574 => 'ⱦ',
+  577 => 'ɂ',
+  579 => 'ƀ',
+  580 => 'ʉ',
+  581 => 'ʌ',
+  582 => 'ɇ',
+  584 => 'ɉ',
+  586 => 'ɋ',
+  588 => 'ɍ',
+  590 => 'ɏ',
+  688 => 'h',
+  689 => 'ɦ',
+  690 => 'j',
+  691 => 'r',
+  692 => 'ɹ',
+  693 => 'ɻ',
+  694 => 'ʁ',
+  695 => 'w',
+  696 => 'y',
+  736 => 'ɣ',
+  737 => 'l',
+  738 => 's',
+  739 => 'x',
+  740 => 'ʕ',
+  832 => '̀',
+  833 => '́',
+  835 => '̓',
+  836 => '̈́',
+  837 => 'ι',
+  880 => 'ͱ',
+  882 => 'ͳ',
+  884 => 'ʹ',
+  886 => 'ͷ',
+  895 => 'ϳ',
+  902 => 'ά',
+  903 => '·',
+  904 => 'έ',
+  905 => 'ή',
+  906 => 'ί',
+  908 => 'ό',
+  910 => 'ύ',
+  911 => 'ώ',
+  913 => 'α',
+  914 => 'β',
+  915 => 'γ',
+  916 => 'δ',
+  917 => 'ε',
+  918 => 'ζ',
+  919 => 'η',
+  920 => 'θ',
+  921 => 'ι',
+  922 => 'κ',
+  923 => 'λ',
+  924 => 'μ',
+  925 => 'ν',
+  926 => 'ξ',
+  927 => 'ο',
+  928 => 'π',
+  929 => 'ρ',
+  931 => 'σ',
+  932 => 'τ',
+  933 => 'υ',
+  934 => 'φ',
+  935 => 'χ',
+  936 => 'ψ',
+  937 => 'ω',
+  938 => 'ϊ',
+  939 => 'ϋ',
+  975 => 'ϗ',
+  976 => 'β',
+  977 => 'θ',
+  978 => 'υ',
+  979 => 'ύ',
+  980 => 'ϋ',
+  981 => 'φ',
+  982 => 'π',
+  984 => 'ϙ',
+  986 => 'ϛ',
+  988 => 'ϝ',
+  990 => 'ϟ',
+  992 => 'ϡ',
+  994 => 'ϣ',
+  996 => 'ϥ',
+  998 => 'ϧ',
+  1000 => 'ϩ',
+  1002 => 'ϫ',
+  1004 => 'ϭ',
+  1006 => 'ϯ',
+  1008 => 'κ',
+  1009 => 'ρ',
+  1010 => 'σ',
+  1012 => 'θ',
+  1013 => 'ε',
+  1015 => 'ϸ',
+  1017 => 'σ',
+  1018 => 'ϻ',
+  1021 => 'ͻ',
+  1022 => 'ͼ',
+  1023 => 'ͽ',
+  1024 => 'ѐ',
+  1025 => 'ё',
+  1026 => 'ђ',
+  1027 => 'ѓ',
+  1028 => 'є',
+  1029 => 'ѕ',
+  1030 => 'і',
+  1031 => 'ї',
+  1032 => 'ј',
+  1033 => 'љ',
+  1034 => 'њ',
+  1035 => 'ћ',
+  1036 => 'ќ',
+  1037 => 'ѝ',
+  1038 => 'ў',
+  1039 => 'џ',
+  1040 => 'а',
+  1041 => 'б',
+  1042 => 'в',
+  1043 => 'г',
+  1044 => 'д',
+  1045 => 'е',
+  1046 => 'ж',
+  1047 => 'з',
+  1048 => 'и',
+  1049 => 'й',
+  1050 => 'к',
+  1051 => 'л',
+  1052 => 'м',
+  1053 => 'н',
+  1054 => 'о',
+  1055 => 'п',
+  1056 => 'р',
+  1057 => 'с',
+  1058 => 'т',
+  1059 => 'у',
+  1060 => 'ф',
+  1061 => 'х',
+  1062 => 'ц',
+  1063 => 'ч',
+  1064 => 'ш',
+  1065 => 'щ',
+  1066 => 'ъ',
+  1067 => 'ы',
+  1068 => 'ь',
+  1069 => 'э',
+  1070 => 'ю',
+  1071 => 'я',
+  1120 => 'ѡ',
+  1122 => 'ѣ',
+  1124 => 'ѥ',
+  1126 => 'ѧ',
+  1128 => 'ѩ',
+  1130 => 'ѫ',
+  1132 => 'ѭ',
+  1134 => 'ѯ',
+  1136 => 'ѱ',
+  1138 => 'ѳ',
+  1140 => 'ѵ',
+  1142 => 'ѷ',
+  1144 => 'ѹ',
+  1146 => 'ѻ',
+  1148 => 'ѽ',
+  1150 => 'ѿ',
+  1152 => 'ҁ',
+  1162 => 'ҋ',
+  1164 => 'ҍ',
+  1166 => 'ҏ',
+  1168 => 'ґ',
+  1170 => 'ғ',
+  1172 => 'ҕ',
+  1174 => 'җ',
+  1176 => 'ҙ',
+  1178 => 'қ',
+  1180 => 'ҝ',
+  1182 => 'ҟ',
+  1184 => 'ҡ',
+  1186 => 'ң',
+  1188 => 'ҥ',
+  1190 => 'ҧ',
+  1192 => 'ҩ',
+  1194 => 'ҫ',
+  1196 => 'ҭ',
+  1198 => 'ү',
+  1200 => 'ұ',
+  1202 => 'ҳ',
+  1204 => 'ҵ',
+  1206 => 'ҷ',
+  1208 => 'ҹ',
+  1210 => 'һ',
+  1212 => 'ҽ',
+  1214 => 'ҿ',
+  1217 => 'ӂ',
+  1219 => 'ӄ',
+  1221 => 'ӆ',
+  1223 => 'ӈ',
+  1225 => 'ӊ',
+  1227 => 'ӌ',
+  1229 => 'ӎ',
+  1232 => 'ӑ',
+  1234 => 'ӓ',
+  1236 => 'ӕ',
+  1238 => 'ӗ',
+  1240 => 'ә',
+  1242 => 'ӛ',
+  1244 => 'ӝ',
+  1246 => 'ӟ',
+  1248 => 'ӡ',
+  1250 => 'ӣ',
+  1252 => 'ӥ',
+  1254 => 'ӧ',
+  1256 => 'ө',
+  1258 => 'ӫ',
+  1260 => 'ӭ',
+  1262 => 'ӯ',
+  1264 => 'ӱ',
+  1266 => 'ӳ',
+  1268 => 'ӵ',
+  1270 => 'ӷ',
+  1272 => 'ӹ',
+  1274 => 'ӻ',
+  1276 => 'ӽ',
+  1278 => 'ӿ',
+  1280 => 'ԁ',
+  1282 => 'ԃ',
+  1284 => 'ԅ',
+  1286 => 'ԇ',
+  1288 => 'ԉ',
+  1290 => 'ԋ',
+  1292 => 'ԍ',
+  1294 => 'ԏ',
+  1296 => 'ԑ',
+  1298 => 'ԓ',
+  1300 => 'ԕ',
+  1302 => 'ԗ',
+  1304 => 'ԙ',
+  1306 => 'ԛ',
+  1308 => 'ԝ',
+  1310 => 'ԟ',
+  1312 => 'ԡ',
+  1314 => 'ԣ',
+  1316 => 'ԥ',
+  1318 => 'ԧ',
+  1320 => 'ԩ',
+  1322 => 'ԫ',
+  1324 => 'ԭ',
+  1326 => 'ԯ',
+  1329 => 'ա',
+  1330 => 'բ',
+  1331 => 'գ',
+  1332 => 'դ',
+  1333 => 'ե',
+  1334 => 'զ',
+  1335 => 'է',
+  1336 => 'ը',
+  1337 => 'թ',
+  1338 => 'ժ',
+  1339 => 'ի',
+  1340 => 'լ',
+  1341 => 'խ',
+  1342 => 'ծ',
+  1343 => 'կ',
+  1344 => 'հ',
+  1345 => 'ձ',
+  1346 => 'ղ',
+  1347 => 'ճ',
+  1348 => 'մ',
+  1349 => 'յ',
+  1350 => 'ն',
+  1351 => 'շ',
+  1352 => 'ո',
+  1353 => 'չ',
+  1354 => 'պ',
+  1355 => 'ջ',
+  1356 => 'ռ',
+  1357 => 'ս',
+  1358 => 'վ',
+  1359 => 'տ',
+  1360 => 'ր',
+  1361 => 'ց',
+  1362 => 'ւ',
+  1363 => 'փ',
+  1364 => 'ք',
+  1365 => 'օ',
+  1366 => 'ֆ',
+  1415 => 'եւ',
+  1653 => 'اٴ',
+  1654 => 'وٴ',
+  1655 => 'ۇٴ',
+  1656 => 'يٴ',
+  2392 => 'क़',
+  2393 => 'ख़',
+  2394 => 'ग़',
+  2395 => 'ज़',
+  2396 => 'ड़',
+  2397 => 'ढ़',
+  2398 => 'फ़',
+  2399 => 'य़',
+  2524 => 'ড়',
+  2525 => 'ঢ়',
+  2527 => 'য়',
+  2611 => 'ਲ਼',
+  2614 => 'ਸ਼',
+  2649 => 'ਖ਼',
+  2650 => 'ਗ਼',
+  2651 => 'ਜ਼',
+  2654 => 'ਫ਼',
+  2908 => 'ଡ଼',
+  2909 => 'ଢ଼',
+  3635 => 'ํา',
+  3763 => 'ໍາ',
+  3804 => 'ຫນ',
+  3805 => 'ຫມ',
+  3852 => '་',
+  3907 => 'གྷ',
+  3917 => 'ཌྷ',
+  3922 => 'དྷ',
+  3927 => 'བྷ',
+  3932 => 'ཛྷ',
+  3945 => 'ཀྵ',
+  3955 => 'ཱི',
+  3957 => 'ཱུ',
+  3958 => 'ྲྀ',
+  3959 => 'ྲཱྀ',
+  3960 => 'ླྀ',
+  3961 => 'ླཱྀ',
+  3969 => 'ཱྀ',
+  3987 => 'ྒྷ',
+  3997 => 'ྜྷ',
+  4002 => 'ྡྷ',
+  4007 => 'ྦྷ',
+  4012 => 'ྫྷ',
+  4025 => 'ྐྵ',
+  4295 => 'ⴧ',
+  4301 => 'ⴭ',
+  4348 => 'ნ',
+  5112 => 'Ᏸ',
+  5113 => 'Ᏹ',
+  5114 => 'Ᏺ',
+  5115 => 'Ᏻ',
+  5116 => 'Ᏼ',
+  5117 => 'Ᏽ',
+  7296 => 'в',
+  7297 => 'д',
+  7298 => 'о',
+  7299 => 'с',
+  7300 => 'т',
+  7301 => 'т',
+  7302 => 'ъ',
+  7303 => 'ѣ',
+  7304 => 'ꙋ',
+  7312 => 'ა',
+  7313 => 'ბ',
+  7314 => 'გ',
+  7315 => 'დ',
+  7316 => 'ე',
+  7317 => 'ვ',
+  7318 => 'ზ',
+  7319 => 'თ',
+  7320 => 'ი',
+  7321 => 'კ',
+  7322 => 'ლ',
+  7323 => 'მ',
+  7324 => 'ნ',
+  7325 => 'ო',
+  7326 => 'პ',
+  7327 => 'ჟ',
+  7328 => 'რ',
+  7329 => 'ს',
+  7330 => 'ტ',
+  7331 => 'უ',
+  7332 => 'ფ',
+  7333 => 'ქ',
+  7334 => 'ღ',
+  7335 => 'ყ',
+  7336 => 'შ',
+  7337 => 'ჩ',
+  7338 => 'ც',
+  7339 => 'ძ',
+  7340 => 'წ',
+  7341 => 'ჭ',
+  7342 => 'ხ',
+  7343 => 'ჯ',
+  7344 => 'ჰ',
+  7345 => 'ჱ',
+  7346 => 'ჲ',
+  7347 => 'ჳ',
+  7348 => 'ჴ',
+  7349 => 'ჵ',
+  7350 => 'ჶ',
+  7351 => 'ჷ',
+  7352 => 'ჸ',
+  7353 => 'ჹ',
+  7354 => 'ჺ',
+  7357 => 'ჽ',
+  7358 => 'ჾ',
+  7359 => 'ჿ',
+  7468 => 'a',
+  7469 => 'æ',
+  7470 => 'b',
+  7472 => 'd',
+  7473 => 'e',
+  7474 => 'ǝ',
+  7475 => 'g',
+  7476 => 'h',
+  7477 => 'i',
+  7478 => 'j',
+  7479 => 'k',
+  7480 => 'l',
+  7481 => 'm',
+  7482 => 'n',
+  7484 => 'o',
+  7485 => 'ȣ',
+  7486 => 'p',
+  7487 => 'r',
+  7488 => 't',
+  7489 => 'u',
+  7490 => 'w',
+  7491 => 'a',
+  7492 => 'ɐ',
+  7493 => 'ɑ',
+  7494 => 'ᴂ',
+  7495 => 'b',
+  7496 => 'd',
+  7497 => 'e',
+  7498 => 'ə',
+  7499 => 'ɛ',
+  7500 => 'ɜ',
+  7501 => 'g',
+  7503 => 'k',
+  7504 => 'm',
+  7505 => 'ŋ',
+  7506 => 'o',
+  7507 => 'ɔ',
+  7508 => 'ᴖ',
+  7509 => 'ᴗ',
+  7510 => 'p',
+  7511 => 't',
+  7512 => 'u',
+  7513 => 'ᴝ',
+  7514 => 'ɯ',
+  7515 => 'v',
+  7516 => 'ᴥ',
+  7517 => 'β',
+  7518 => 'γ',
+  7519 => 'δ',
+  7520 => 'φ',
+  7521 => 'χ',
+  7522 => 'i',
+  7523 => 'r',
+  7524 => 'u',
+  7525 => 'v',
+  7526 => 'β',
+  7527 => 'γ',
+  7528 => 'ρ',
+  7529 => 'φ',
+  7530 => 'χ',
+  7544 => 'н',
+  7579 => 'ɒ',
+  7580 => 'c',
+  7581 => 'ɕ',
+  7582 => 'ð',
+  7583 => 'ɜ',
+  7584 => 'f',
+  7585 => 'ɟ',
+  7586 => 'ɡ',
+  7587 => 'ɥ',
+  7588 => 'ɨ',
+  7589 => 'ɩ',
+  7590 => 'ɪ',
+  7591 => 'ᵻ',
+  7592 => 'ʝ',
+  7593 => 'ɭ',
+  7594 => 'ᶅ',
+  7595 => 'ʟ',
+  7596 => 'ɱ',
+  7597 => 'ɰ',
+  7598 => 'ɲ',
+  7599 => 'ɳ',
+  7600 => 'ɴ',
+  7601 => 'ɵ',
+  7602 => 'ɸ',
+  7603 => 'ʂ',
+  7604 => 'ʃ',
+  7605 => 'ƫ',
+  7606 => 'ʉ',
+  7607 => 'ʊ',
+  7608 => 'ᴜ',
+  7609 => 'ʋ',
+  7610 => 'ʌ',
+  7611 => 'z',
+  7612 => 'ʐ',
+  7613 => 'ʑ',
+  7614 => 'ʒ',
+  7615 => 'θ',
+  7680 => 'ḁ',
+  7682 => 'ḃ',
+  7684 => 'ḅ',
+  7686 => 'ḇ',
+  7688 => 'ḉ',
+  7690 => 'ḋ',
+  7692 => 'ḍ',
+  7694 => 'ḏ',
+  7696 => 'ḑ',
+  7698 => 'ḓ',
+  7700 => 'ḕ',
+  7702 => 'ḗ',
+  7704 => 'ḙ',
+  7706 => 'ḛ',
+  7708 => 'ḝ',
+  7710 => 'ḟ',
+  7712 => 'ḡ',
+  7714 => 'ḣ',
+  7716 => 'ḥ',
+  7718 => 'ḧ',
+  7720 => 'ḩ',
+  7722 => 'ḫ',
+  7724 => 'ḭ',
+  7726 => 'ḯ',
+  7728 => 'ḱ',
+  7730 => 'ḳ',
+  7732 => 'ḵ',
+  7734 => 'ḷ',
+  7736 => 'ḹ',
+  7738 => 'ḻ',
+  7740 => 'ḽ',
+  7742 => 'ḿ',
+  7744 => 'ṁ',
+  7746 => 'ṃ',
+  7748 => 'ṅ',
+  7750 => 'ṇ',
+  7752 => 'ṉ',
+  7754 => 'ṋ',
+  7756 => 'ṍ',
+  7758 => 'ṏ',
+  7760 => 'ṑ',
+  7762 => 'ṓ',
+  7764 => 'ṕ',
+  7766 => 'ṗ',
+  7768 => 'ṙ',
+  7770 => 'ṛ',
+  7772 => 'ṝ',
+  7774 => 'ṟ',
+  7776 => 'ṡ',
+  7778 => 'ṣ',
+  7780 => 'ṥ',
+  7782 => 'ṧ',
+  7784 => 'ṩ',
+  7786 => 'ṫ',
+  7788 => 'ṭ',
+  7790 => 'ṯ',
+  7792 => 'ṱ',
+  7794 => 'ṳ',
+  7796 => 'ṵ',
+  7798 => 'ṷ',
+  7800 => 'ṹ',
+  7802 => 'ṻ',
+  7804 => 'ṽ',
+  7806 => 'ṿ',
+  7808 => 'ẁ',
+  7810 => 'ẃ',
+  7812 => 'ẅ',
+  7814 => 'ẇ',
+  7816 => 'ẉ',
+  7818 => 'ẋ',
+  7820 => 'ẍ',
+  7822 => 'ẏ',
+  7824 => 'ẑ',
+  7826 => 'ẓ',
+  7828 => 'ẕ',
+  7834 => 'aʾ',
+  7835 => 'ṡ',
+  7838 => 'ss',
+  7840 => 'ạ',
+  7842 => 'ả',
+  7844 => 'ấ',
+  7846 => 'ầ',
+  7848 => 'ẩ',
+  7850 => 'ẫ',
+  7852 => 'ậ',
+  7854 => 'ắ',
+  7856 => 'ằ',
+  7858 => 'ẳ',
+  7860 => 'ẵ',
+  7862 => 'ặ',
+  7864 => 'ẹ',
+  7866 => 'ẻ',
+  7868 => 'ẽ',
+  7870 => 'ế',
+  7872 => 'ề',
+  7874 => 'ể',
+  7876 => 'ễ',
+  7878 => 'ệ',
+  7880 => 'ỉ',
+  7882 => 'ị',
+  7884 => 'ọ',
+  7886 => 'ỏ',
+  7888 => 'ố',
+  7890 => 'ồ',
+  7892 => 'ổ',
+  7894 => 'ỗ',
+  7896 => 'ộ',
+  7898 => 'ớ',
+  7900 => 'ờ',
+  7902 => 'ở',
+  7904 => 'ỡ',
+  7906 => 'ợ',
+  7908 => 'ụ',
+  7910 => 'ủ',
+  7912 => 'ứ',
+  7914 => 'ừ',
+  7916 => 'ử',
+  7918 => 'ữ',
+  7920 => 'ự',
+  7922 => 'ỳ',
+  7924 => 'ỵ',
+  7926 => 'ỷ',
+  7928 => 'ỹ',
+  7930 => 'ỻ',
+  7932 => 'ỽ',
+  7934 => 'ỿ',
+  7944 => 'ἀ',
+  7945 => 'ἁ',
+  7946 => 'ἂ',
+  7947 => 'ἃ',
+  7948 => 'ἄ',
+  7949 => 'ἅ',
+  7950 => 'ἆ',
+  7951 => 'ἇ',
+  7960 => 'ἐ',
+  7961 => 'ἑ',
+  7962 => 'ἒ',
+  7963 => 'ἓ',
+  7964 => 'ἔ',
+  7965 => 'ἕ',
+  7976 => 'ἠ',
+  7977 => 'ἡ',
+  7978 => 'ἢ',
+  7979 => 'ἣ',
+  7980 => 'ἤ',
+  7981 => 'ἥ',
+  7982 => 'ἦ',
+  7983 => 'ἧ',
+  7992 => 'ἰ',
+  7993 => 'ἱ',
+  7994 => 'ἲ',
+  7995 => 'ἳ',
+  7996 => 'ἴ',
+  7997 => 'ἵ',
+  7998 => 'ἶ',
+  7999 => 'ἷ',
+  8008 => 'ὀ',
+  8009 => 'ὁ',
+  8010 => 'ὂ',
+  8011 => 'ὃ',
+  8012 => 'ὄ',
+  8013 => 'ὅ',
+  8025 => 'ὑ',
+  8027 => 'ὓ',
+  8029 => 'ὕ',
+  8031 => 'ὗ',
+  8040 => 'ὠ',
+  8041 => 'ὡ',
+  8042 => 'ὢ',
+  8043 => 'ὣ',
+  8044 => 'ὤ',
+  8045 => 'ὥ',
+  8046 => 'ὦ',
+  8047 => 'ὧ',
+  8049 => 'ά',
+  8051 => 'έ',
+  8053 => 'ή',
+  8055 => 'ί',
+  8057 => 'ό',
+  8059 => 'ύ',
+  8061 => 'ώ',
+  8064 => 'ἀι',
+  8065 => 'ἁι',
+  8066 => 'ἂι',
+  8067 => 'ἃι',
+  8068 => 'ἄι',
+  8069 => 'ἅι',
+  8070 => 'ἆι',
+  8071 => 'ἇι',
+  8072 => 'ἀι',
+  8073 => 'ἁι',
+  8074 => 'ἂι',
+  8075 => 'ἃι',
+  8076 => 'ἄι',
+  8077 => 'ἅι',
+  8078 => 'ἆι',
+  8079 => 'ἇι',
+  8080 => 'ἠι',
+  8081 => 'ἡι',
+  8082 => 'ἢι',
+  8083 => 'ἣι',
+  8084 => 'ἤι',
+  8085 => 'ἥι',
+  8086 => 'ἦι',
+  8087 => 'ἧι',
+  8088 => 'ἠι',
+  8089 => 'ἡι',
+  8090 => 'ἢι',
+  8091 => 'ἣι',
+  8092 => 'ἤι',
+  8093 => 'ἥι',
+  8094 => 'ἦι',
+  8095 => 'ἧι',
+  8096 => 'ὠι',
+  8097 => 'ὡι',
+  8098 => 'ὢι',
+  8099 => 'ὣι',
+  8100 => 'ὤι',
+  8101 => 'ὥι',
+  8102 => 'ὦι',
+  8103 => 'ὧι',
+  8104 => 'ὠι',
+  8105 => 'ὡι',
+  8106 => 'ὢι',
+  8107 => 'ὣι',
+  8108 => 'ὤι',
+  8109 => 'ὥι',
+  8110 => 'ὦι',
+  8111 => 'ὧι',
+  8114 => 'ὰι',
+  8115 => 'αι',
+  8116 => 'άι',
+  8119 => 'ᾶι',
+  8120 => 'ᾰ',
+  8121 => 'ᾱ',
+  8122 => 'ὰ',
+  8123 => 'ά',
+  8124 => 'αι',
+  8126 => 'ι',
+  8130 => 'ὴι',
+  8131 => 'ηι',
+  8132 => 'ήι',
+  8135 => 'ῆι',
+  8136 => 'ὲ',
+  8137 => 'έ',
+  8138 => 'ὴ',
+  8139 => 'ή',
+  8140 => 'ηι',
+  8147 => 'ΐ',
+  8152 => 'ῐ',
+  8153 => 'ῑ',
+  8154 => 'ὶ',
+  8155 => 'ί',
+  8163 => 'ΰ',
+  8168 => 'ῠ',
+  8169 => 'ῡ',
+  8170 => 'ὺ',
+  8171 => 'ύ',
+  8172 => 'ῥ',
+  8178 => 'ὼι',
+  8179 => 'ωι',
+  8180 => 'ώι',
+  8183 => 'ῶι',
+  8184 => 'ὸ',
+  8185 => 'ό',
+  8186 => 'ὼ',
+  8187 => 'ώ',
+  8188 => 'ωι',
+  8209 => '‐',
+  8243 => '′′',
+  8244 => '′′′',
+  8246 => '‵‵',
+  8247 => '‵‵‵',
+  8279 => '′′′′',
+  8304 => '0',
+  8305 => 'i',
+  8308 => '4',
+  8309 => '5',
+  8310 => '6',
+  8311 => '7',
+  8312 => '8',
+  8313 => '9',
+  8315 => '−',
+  8319 => 'n',
+  8320 => '0',
+  8321 => '1',
+  8322 => '2',
+  8323 => '3',
+  8324 => '4',
+  8325 => '5',
+  8326 => '6',
+  8327 => '7',
+  8328 => '8',
+  8329 => '9',
+  8331 => '−',
+  8336 => 'a',
+  8337 => 'e',
+  8338 => 'o',
+  8339 => 'x',
+  8340 => 'ə',
+  8341 => 'h',
+  8342 => 'k',
+  8343 => 'l',
+  8344 => 'm',
+  8345 => 'n',
+  8346 => 'p',
+  8347 => 's',
+  8348 => 't',
+  8360 => 'rs',
+  8450 => 'c',
+  8451 => '°c',
+  8455 => 'ɛ',
+  8457 => '°f',
+  8458 => 'g',
+  8459 => 'h',
+  8460 => 'h',
+  8461 => 'h',
+  8462 => 'h',
+  8463 => 'ħ',
+  8464 => 'i',
+  8465 => 'i',
+  8466 => 'l',
+  8467 => 'l',
+  8469 => 'n',
+  8470 => 'no',
+  8473 => 'p',
+  8474 => 'q',
+  8475 => 'r',
+  8476 => 'r',
+  8477 => 'r',
+  8480 => 'sm',
+  8481 => 'tel',
+  8482 => 'tm',
+  8484 => 'z',
+  8486 => 'ω',
+  8488 => 'z',
+  8490 => 'k',
+  8491 => 'å',
+  8492 => 'b',
+  8493 => 'c',
+  8495 => 'e',
+  8496 => 'e',
+  8497 => 'f',
+  8499 => 'm',
+  8500 => 'o',
+  8501 => 'א',
+  8502 => 'ב',
+  8503 => 'ג',
+  8504 => 'ד',
+  8505 => 'i',
+  8507 => 'fax',
+  8508 => 'π',
+  8509 => 'γ',
+  8510 => 'γ',
+  8511 => 'π',
+  8512 => '∑',
+  8517 => 'd',
+  8518 => 'd',
+  8519 => 'e',
+  8520 => 'i',
+  8521 => 'j',
+  8528 => '1⁄7',
+  8529 => '1⁄9',
+  8530 => '1⁄10',
+  8531 => '1⁄3',
+  8532 => '2⁄3',
+  8533 => '1⁄5',
+  8534 => '2⁄5',
+  8535 => '3⁄5',
+  8536 => '4⁄5',
+  8537 => '1⁄6',
+  8538 => '5⁄6',
+  8539 => '1⁄8',
+  8540 => '3⁄8',
+  8541 => '5⁄8',
+  8542 => '7⁄8',
+  8543 => '1⁄',
+  8544 => 'i',
+  8545 => 'ii',
+  8546 => 'iii',
+  8547 => 'iv',
+  8548 => 'v',
+  8549 => 'vi',
+  8550 => 'vii',
+  8551 => 'viii',
+  8552 => 'ix',
+  8553 => 'x',
+  8554 => 'xi',
+  8555 => 'xii',
+  8556 => 'l',
+  8557 => 'c',
+  8558 => 'd',
+  8559 => 'm',
+  8560 => 'i',
+  8561 => 'ii',
+  8562 => 'iii',
+  8563 => 'iv',
+  8564 => 'v',
+  8565 => 'vi',
+  8566 => 'vii',
+  8567 => 'viii',
+  8568 => 'ix',
+  8569 => 'x',
+  8570 => 'xi',
+  8571 => 'xii',
+  8572 => 'l',
+  8573 => 'c',
+  8574 => 'd',
+  8575 => 'm',
+  8585 => '0⁄3',
+  8748 => '∫∫',
+  8749 => '∫∫∫',
+  8751 => '∮∮',
+  8752 => '∮∮∮',
+  9001 => '〈',
+  9002 => '〉',
+  9312 => '1',
+  9313 => '2',
+  9314 => '3',
+  9315 => '4',
+  9316 => '5',
+  9317 => '6',
+  9318 => '7',
+  9319 => '8',
+  9320 => '9',
+  9321 => '10',
+  9322 => '11',
+  9323 => '12',
+  9324 => '13',
+  9325 => '14',
+  9326 => '15',
+  9327 => '16',
+  9328 => '17',
+  9329 => '18',
+  9330 => '19',
+  9331 => '20',
+  9398 => 'a',
+  9399 => 'b',
+  9400 => 'c',
+  9401 => 'd',
+  9402 => 'e',
+  9403 => 'f',
+  9404 => 'g',
+  9405 => 'h',
+  9406 => 'i',
+  9407 => 'j',
+  9408 => 'k',
+  9409 => 'l',
+  9410 => 'm',
+  9411 => 'n',
+  9412 => 'o',
+  9413 => 'p',
+  9414 => 'q',
+  9415 => 'r',
+  9416 => 's',
+  9417 => 't',
+  9418 => 'u',
+  9419 => 'v',
+  9420 => 'w',
+  9421 => 'x',
+  9422 => 'y',
+  9423 => 'z',
+  9424 => 'a',
+  9425 => 'b',
+  9426 => 'c',
+  9427 => 'd',
+  9428 => 'e',
+  9429 => 'f',
+  9430 => 'g',
+  9431 => 'h',
+  9432 => 'i',
+  9433 => 'j',
+  9434 => 'k',
+  9435 => 'l',
+  9436 => 'm',
+  9437 => 'n',
+  9438 => 'o',
+  9439 => 'p',
+  9440 => 'q',
+  9441 => 'r',
+  9442 => 's',
+  9443 => 't',
+  9444 => 'u',
+  9445 => 'v',
+  9446 => 'w',
+  9447 => 'x',
+  9448 => 'y',
+  9449 => 'z',
+  9450 => '0',
+  10764 => '∫∫∫∫',
+  10972 => '⫝̸',
+  11264 => 'ⰰ',
+  11265 => 'ⰱ',
+  11266 => 'ⰲ',
+  11267 => 'ⰳ',
+  11268 => 'ⰴ',
+  11269 => 'ⰵ',
+  11270 => 'ⰶ',
+  11271 => 'ⰷ',
+  11272 => 'ⰸ',
+  11273 => 'ⰹ',
+  11274 => 'ⰺ',
+  11275 => 'ⰻ',
+  11276 => 'ⰼ',
+  11277 => 'ⰽ',
+  11278 => 'ⰾ',
+  11279 => 'ⰿ',
+  11280 => 'ⱀ',
+  11281 => 'ⱁ',
+  11282 => 'ⱂ',
+  11283 => 'ⱃ',
+  11284 => 'ⱄ',
+  11285 => 'ⱅ',
+  11286 => 'ⱆ',
+  11287 => 'ⱇ',
+  11288 => 'ⱈ',
+  11289 => 'ⱉ',
+  11290 => 'ⱊ',
+  11291 => 'ⱋ',
+  11292 => 'ⱌ',
+  11293 => 'ⱍ',
+  11294 => 'ⱎ',
+  11295 => 'ⱏ',
+  11296 => 'ⱐ',
+  11297 => 'ⱑ',
+  11298 => 'ⱒ',
+  11299 => 'ⱓ',
+  11300 => 'ⱔ',
+  11301 => 'ⱕ',
+  11302 => 'ⱖ',
+  11303 => 'ⱗ',
+  11304 => 'ⱘ',
+  11305 => 'ⱙ',
+  11306 => 'ⱚ',
+  11307 => 'ⱛ',
+  11308 => 'ⱜ',
+  11309 => 'ⱝ',
+  11310 => 'ⱞ',
+  11360 => 'ⱡ',
+  11362 => 'ɫ',
+  11363 => 'ᵽ',
+  11364 => 'ɽ',
+  11367 => 'ⱨ',
+  11369 => 'ⱪ',
+  11371 => 'ⱬ',
+  11373 => 'ɑ',
+  11374 => 'ɱ',
+  11375 => 'ɐ',
+  11376 => 'ɒ',
+  11378 => 'ⱳ',
+  11381 => 'ⱶ',
+  11388 => 'j',
+  11389 => 'v',
+  11390 => 'ȿ',
+  11391 => 'ɀ',
+  11392 => 'ⲁ',
+  11394 => 'ⲃ',
+  11396 => 'ⲅ',
+  11398 => 'ⲇ',
+  11400 => 'ⲉ',
+  11402 => 'ⲋ',
+  11404 => 'ⲍ',
+  11406 => 'ⲏ',
+  11408 => 'ⲑ',
+  11410 => 'ⲓ',
+  11412 => 'ⲕ',
+  11414 => 'ⲗ',
+  11416 => 'ⲙ',
+  11418 => 'ⲛ',
+  11420 => 'ⲝ',
+  11422 => 'ⲟ',
+  11424 => 'ⲡ',
+  11426 => 'ⲣ',
+  11428 => 'ⲥ',
+  11430 => 'ⲧ',
+  11432 => 'ⲩ',
+  11434 => 'ⲫ',
+  11436 => 'ⲭ',
+  11438 => 'ⲯ',
+  11440 => 'ⲱ',
+  11442 => 'ⲳ',
+  11444 => 'ⲵ',
+  11446 => 'ⲷ',
+  11448 => 'ⲹ',
+  11450 => 'ⲻ',
+  11452 => 'ⲽ',
+  11454 => 'ⲿ',
+  11456 => 'ⳁ',
+  11458 => 'ⳃ',
+  11460 => 'ⳅ',
+  11462 => 'ⳇ',
+  11464 => 'ⳉ',
+  11466 => 'ⳋ',
+  11468 => 'ⳍ',
+  11470 => 'ⳏ',
+  11472 => 'ⳑ',
+  11474 => 'ⳓ',
+  11476 => 'ⳕ',
+  11478 => 'ⳗ',
+  11480 => 'ⳙ',
+  11482 => 'ⳛ',
+  11484 => 'ⳝ',
+  11486 => 'ⳟ',
+  11488 => 'ⳡ',
+  11490 => 'ⳣ',
+  11499 => 'ⳬ',
+  11501 => 'ⳮ',
+  11506 => 'ⳳ',
+  11631 => 'ⵡ',
+  11935 => '母',
+  12019 => '龟',
+  12032 => '一',
+  12033 => '丨',
+  12034 => '丶',
+  12035 => '丿',
+  12036 => '乙',
+  12037 => '亅',
+  12038 => '二',
+  12039 => '亠',
+  12040 => '人',
+  12041 => '儿',
+  12042 => '入',
+  12043 => '八',
+  12044 => '冂',
+  12045 => '冖',
+  12046 => '冫',
+  12047 => '几',
+  12048 => '凵',
+  12049 => '刀',
+  12050 => '力',
+  12051 => '勹',
+  12052 => '匕',
+  12053 => '匚',
+  12054 => '匸',
+  12055 => '十',
+  12056 => '卜',
+  12057 => '卩',
+  12058 => '厂',
+  12059 => '厶',
+  12060 => '又',
+  12061 => '口',
+  12062 => '囗',
+  12063 => '土',
+  12064 => '士',
+  12065 => '夂',
+  12066 => '夊',
+  12067 => '夕',
+  12068 => '大',
+  12069 => '女',
+  12070 => '子',
+  12071 => '宀',
+  12072 => '寸',
+  12073 => '小',
+  12074 => '尢',
+  12075 => '尸',
+  12076 => '屮',
+  12077 => '山',
+  12078 => '巛',
+  12079 => '工',
+  12080 => '己',
+  12081 => '巾',
+  12082 => '干',
+  12083 => '幺',
+  12084 => '广',
+  12085 => '廴',
+  12086 => '廾',
+  12087 => '弋',
+  12088 => '弓',
+  12089 => '彐',
+  12090 => '彡',
+  12091 => '彳',
+  12092 => '心',
+  12093 => '戈',
+  12094 => '戶',
+  12095 => '手',
+  12096 => '支',
+  12097 => '攴',
+  12098 => '文',
+  12099 => '斗',
+  12100 => '斤',
+  12101 => '方',
+  12102 => '无',
+  12103 => '日',
+  12104 => '曰',
+  12105 => '月',
+  12106 => '木',
+  12107 => '欠',
+  12108 => '止',
+  12109 => '歹',
+  12110 => '殳',
+  12111 => '毋',
+  12112 => '比',
+  12113 => '毛',
+  12114 => '氏',
+  12115 => '气',
+  12116 => '水',
+  12117 => '火',
+  12118 => '爪',
+  12119 => '父',
+  12120 => '爻',
+  12121 => '爿',
+  12122 => '片',
+  12123 => '牙',
+  12124 => '牛',
+  12125 => '犬',
+  12126 => '玄',
+  12127 => '玉',
+  12128 => '瓜',
+  12129 => '瓦',
+  12130 => '甘',
+  12131 => '生',
+  12132 => '用',
+  12133 => '田',
+  12134 => '疋',
+  12135 => '疒',
+  12136 => '癶',
+  12137 => '白',
+  12138 => '皮',
+  12139 => '皿',
+  12140 => '目',
+  12141 => '矛',
+  12142 => '矢',
+  12143 => '石',
+  12144 => '示',
+  12145 => '禸',
+  12146 => '禾',
+  12147 => '穴',
+  12148 => '立',
+  12149 => '竹',
+  12150 => '米',
+  12151 => '糸',
+  12152 => '缶',
+  12153 => '网',
+  12154 => '羊',
+  12155 => '羽',
+  12156 => '老',
+  12157 => '而',
+  12158 => '耒',
+  12159 => '耳',
+  12160 => '聿',
+  12161 => '肉',
+  12162 => '臣',
+  12163 => '自',
+  12164 => '至',
+  12165 => '臼',
+  12166 => '舌',
+  12167 => '舛',
+  12168 => '舟',
+  12169 => '艮',
+  12170 => '色',
+  12171 => '艸',
+  12172 => '虍',
+  12173 => '虫',
+  12174 => '血',
+  12175 => '行',
+  12176 => '衣',
+  12177 => '襾',
+  12178 => '見',
+  12179 => '角',
+  12180 => '言',
+  12181 => '谷',
+  12182 => '豆',
+  12183 => '豕',
+  12184 => '豸',
+  12185 => '貝',
+  12186 => '赤',
+  12187 => '走',
+  12188 => '足',
+  12189 => '身',
+  12190 => '車',
+  12191 => '辛',
+  12192 => '辰',
+  12193 => '辵',
+  12194 => '邑',
+  12195 => '酉',
+  12196 => '釆',
+  12197 => '里',
+  12198 => '金',
+  12199 => '長',
+  12200 => '門',
+  12201 => '阜',
+  12202 => '隶',
+  12203 => '隹',
+  12204 => '雨',
+  12205 => '靑',
+  12206 => '非',
+  12207 => '面',
+  12208 => '革',
+  12209 => '韋',
+  12210 => '韭',
+  12211 => '音',
+  12212 => '頁',
+  12213 => '風',
+  12214 => '飛',
+  12215 => '食',
+  12216 => '首',
+  12217 => '香',
+  12218 => '馬',
+  12219 => '骨',
+  12220 => '高',
+  12221 => '髟',
+  12222 => '鬥',
+  12223 => '鬯',
+  12224 => '鬲',
+  12225 => '鬼',
+  12226 => '魚',
+  12227 => '鳥',
+  12228 => '鹵',
+  12229 => '鹿',
+  12230 => '麥',
+  12231 => '麻',
+  12232 => '黃',
+  12233 => '黍',
+  12234 => '黑',
+  12235 => '黹',
+  12236 => '黽',
+  12237 => '鼎',
+  12238 => '鼓',
+  12239 => '鼠',
+  12240 => '鼻',
+  12241 => '齊',
+  12242 => '齒',
+  12243 => '龍',
+  12244 => '龜',
+  12245 => '龠',
+  12290 => '.',
+  12342 => '〒',
+  12344 => '十',
+  12345 => '卄',
+  12346 => '卅',
+  12447 => 'より',
+  12543 => 'コト',
+  12593 => 'ᄀ',
+  12594 => 'ᄁ',
+  12595 => 'ᆪ',
+  12596 => 'ᄂ',
+  12597 => 'ᆬ',
+  12598 => 'ᆭ',
+  12599 => 'ᄃ',
+  12600 => 'ᄄ',
+  12601 => 'ᄅ',
+  12602 => 'ᆰ',
+  12603 => 'ᆱ',
+  12604 => 'ᆲ',
+  12605 => 'ᆳ',
+  12606 => 'ᆴ',
+  12607 => 'ᆵ',
+  12608 => 'ᄚ',
+  12609 => 'ᄆ',
+  12610 => 'ᄇ',
+  12611 => 'ᄈ',
+  12612 => 'ᄡ',
+  12613 => 'ᄉ',
+  12614 => 'ᄊ',
+  12615 => 'ᄋ',
+  12616 => 'ᄌ',
+  12617 => 'ᄍ',
+  12618 => 'ᄎ',
+  12619 => 'ᄏ',
+  12620 => 'ᄐ',
+  12621 => 'ᄑ',
+  12622 => 'ᄒ',
+  12623 => 'ᅡ',
+  12624 => 'ᅢ',
+  12625 => 'ᅣ',
+  12626 => 'ᅤ',
+  12627 => 'ᅥ',
+  12628 => 'ᅦ',
+  12629 => 'ᅧ',
+  12630 => 'ᅨ',
+  12631 => 'ᅩ',
+  12632 => 'ᅪ',
+  12633 => 'ᅫ',
+  12634 => 'ᅬ',
+  12635 => 'ᅭ',
+  12636 => 'ᅮ',
+  12637 => 'ᅯ',
+  12638 => 'ᅰ',
+  12639 => 'ᅱ',
+  12640 => 'ᅲ',
+  12641 => 'ᅳ',
+  12642 => 'ᅴ',
+  12643 => 'ᅵ',
+  12645 => 'ᄔ',
+  12646 => 'ᄕ',
+  12647 => 'ᇇ',
+  12648 => 'ᇈ',
+  12649 => 'ᇌ',
+  12650 => 'ᇎ',
+  12651 => 'ᇓ',
+  12652 => 'ᇗ',
+  12653 => 'ᇙ',
+  12654 => 'ᄜ',
+  12655 => 'ᇝ',
+  12656 => 'ᇟ',
+  12657 => 'ᄝ',
+  12658 => 'ᄞ',
+  12659 => 'ᄠ',
+  12660 => 'ᄢ',
+  12661 => 'ᄣ',
+  12662 => 'ᄧ',
+  12663 => 'ᄩ',
+  12664 => 'ᄫ',
+  12665 => 'ᄬ',
+  12666 => 'ᄭ',
+  12667 => 'ᄮ',
+  12668 => 'ᄯ',
+  12669 => 'ᄲ',
+  12670 => 'ᄶ',
+  12671 => 'ᅀ',
+  12672 => 'ᅇ',
+  12673 => 'ᅌ',
+  12674 => 'ᇱ',
+  12675 => 'ᇲ',
+  12676 => 'ᅗ',
+  12677 => 'ᅘ',
+  12678 => 'ᅙ',
+  12679 => 'ᆄ',
+  12680 => 'ᆅ',
+  12681 => 'ᆈ',
+  12682 => 'ᆑ',
+  12683 => 'ᆒ',
+  12684 => 'ᆔ',
+  12685 => 'ᆞ',
+  12686 => 'ᆡ',
+  12690 => '一',
+  12691 => '二',
+  12692 => '三',
+  12693 => '四',
+  12694 => '上',
+  12695 => '中',
+  12696 => '下',
+  12697 => '甲',
+  12698 => '乙',
+  12699 => '丙',
+  12700 => '丁',
+  12701 => '天',
+  12702 => '地',
+  12703 => '人',
+  12868 => '問',
+  12869 => '幼',
+  12870 => '文',
+  12871 => '箏',
+  12880 => 'pte',
+  12881 => '21',
+  12882 => '22',
+  12883 => '23',
+  12884 => '24',
+  12885 => '25',
+  12886 => '26',
+  12887 => '27',
+  12888 => '28',
+  12889 => '29',
+  12890 => '30',
+  12891 => '31',
+  12892 => '32',
+  12893 => '33',
+  12894 => '34',
+  12895 => '35',
+  12896 => 'ᄀ',
+  12897 => 'ᄂ',
+  12898 => 'ᄃ',
+  12899 => 'ᄅ',
+  12900 => 'ᄆ',
+  12901 => 'ᄇ',
+  12902 => 'ᄉ',
+  12903 => 'ᄋ',
+  12904 => 'ᄌ',
+  12905 => 'ᄎ',
+  12906 => 'ᄏ',
+  12907 => 'ᄐ',
+  12908 => 'ᄑ',
+  12909 => 'ᄒ',
+  12910 => '가',
+  12911 => '나',
+  12912 => '다',
+  12913 => '라',
+  12914 => '마',
+  12915 => '바',
+  12916 => '사',
+  12917 => '아',
+  12918 => '자',
+  12919 => '차',
+  12920 => '카',
+  12921 => '타',
+  12922 => '파',
+  12923 => '하',
+  12924 => '참고',
+  12925 => '주의',
+  12926 => '우',
+  12928 => '一',
+  12929 => '二',
+  12930 => '三',
+  12931 => '四',
+  12932 => '五',
+  12933 => '六',
+  12934 => '七',
+  12935 => '八',
+  12936 => '九',
+  12937 => '十',
+  12938 => '月',
+  12939 => '火',
+  12940 => '水',
+  12941 => '木',
+  12942 => '金',
+  12943 => '土',
+  12944 => '日',
+  12945 => '株',
+  12946 => '有',
+  12947 => '社',
+  12948 => '名',
+  12949 => '特',
+  12950 => '財',
+  12951 => '祝',
+  12952 => '労',
+  12953 => '秘',
+  12954 => '男',
+  12955 => '女',
+  12956 => '適',
+  12957 => '優',
+  12958 => '印',
+  12959 => '注',
+  12960 => '項',
+  12961 => '休',
+  12962 => '写',
+  12963 => '正',
+  12964 => '上',
+  12965 => '中',
+  12966 => '下',
+  12967 => '左',
+  12968 => '右',
+  12969 => '医',
+  12970 => '宗',
+  12971 => '学',
+  12972 => '監',
+  12973 => '企',
+  12974 => '資',
+  12975 => '協',
+  12976 => '夜',
+  12977 => '36',
+  12978 => '37',
+  12979 => '38',
+  12980 => '39',
+  12981 => '40',
+  12982 => '41',
+  12983 => '42',
+  12984 => '43',
+  12985 => '44',
+  12986 => '45',
+  12987 => '46',
+  12988 => '47',
+  12989 => '48',
+  12990 => '49',
+  12991 => '50',
+  12992 => '1月',
+  12993 => '2月',
+  12994 => '3月',
+  12995 => '4月',
+  12996 => '5月',
+  12997 => '6月',
+  12998 => '7月',
+  12999 => '8月',
+  13000 => '9月',
+  13001 => '10月',
+  13002 => '11月',
+  13003 => '12月',
+  13004 => 'hg',
+  13005 => 'erg',
+  13006 => 'ev',
+  13007 => 'ltd',
+  13008 => 'ア',
+  13009 => 'イ',
+  13010 => 'ウ',
+  13011 => 'エ',
+  13012 => 'オ',
+  13013 => 'カ',
+  13014 => 'キ',
+  13015 => 'ク',
+  13016 => 'ケ',
+  13017 => 'コ',
+  13018 => 'サ',
+  13019 => 'シ',
+  13020 => 'ス',
+  13021 => 'セ',
+  13022 => 'ソ',
+  13023 => 'タ',
+  13024 => 'チ',
+  13025 => 'ツ',
+  13026 => 'テ',
+  13027 => 'ト',
+  13028 => 'ナ',
+  13029 => 'ニ',
+  13030 => 'ヌ',
+  13031 => 'ネ',
+  13032 => 'ノ',
+  13033 => 'ハ',
+  13034 => 'ヒ',
+  13035 => 'フ',
+  13036 => 'ヘ',
+  13037 => 'ホ',
+  13038 => 'マ',
+  13039 => 'ミ',
+  13040 => 'ム',
+  13041 => 'メ',
+  13042 => 'モ',
+  13043 => 'ヤ',
+  13044 => 'ユ',
+  13045 => 'ヨ',
+  13046 => 'ラ',
+  13047 => 'リ',
+  13048 => 'ル',
+  13049 => 'レ',
+  13050 => 'ロ',
+  13051 => 'ワ',
+  13052 => 'ヰ',
+  13053 => 'ヱ',
+  13054 => 'ヲ',
+  13055 => '令和',
+  13056 => 'アパート',
+  13057 => 'アルファ',
+  13058 => 'アンペア',
+  13059 => 'アール',
+  13060 => 'イニング',
+  13061 => 'インチ',
+  13062 => 'ウォン',
+  13063 => 'エスクード',
+  13064 => 'エーカー',
+  13065 => 'オンス',
+  13066 => 'オーム',
+  13067 => 'カイリ',
+  13068 => 'カラット',
+  13069 => 'カロリー',
+  13070 => 'ガロン',
+  13071 => 'ガンマ',
+  13072 => 'ギガ',
+  13073 => 'ギニー',
+  13074 => 'キュリー',
+  13075 => 'ギルダー',
+  13076 => 'キロ',
+  13077 => 'キログラム',
+  13078 => 'キロメートル',
+  13079 => 'キロワット',
+  13080 => 'グラム',
+  13081 => 'グラムトン',
+  13082 => 'クルゼイロ',
+  13083 => 'クローネ',
+  13084 => 'ケース',
+  13085 => 'コルナ',
+  13086 => 'コーポ',
+  13087 => 'サイクル',
+  13088 => 'サンチーム',
+  13089 => 'シリング',
+  13090 => 'センチ',
+  13091 => 'セント',
+  13092 => 'ダース',
+  13093 => 'デシ',
+  13094 => 'ドル',
+  13095 => 'トン',
+  13096 => 'ナノ',
+  13097 => 'ノット',
+  13098 => 'ハイツ',
+  13099 => 'パーセント',
+  13100 => 'パーツ',
+  13101 => 'バーレル',
+  13102 => 'ピアストル',
+  13103 => 'ピクル',
+  13104 => 'ピコ',
+  13105 => 'ビル',
+  13106 => 'ファラッド',
+  13107 => 'フィート',
+  13108 => 'ブッシェル',
+  13109 => 'フラン',
+  13110 => 'ヘクタール',
+  13111 => 'ペソ',
+  13112 => 'ペニヒ',
+  13113 => 'ヘルツ',
+  13114 => 'ペンス',
+  13115 => 'ページ',
+  13116 => 'ベータ',
+  13117 => 'ポイント',
+  13118 => 'ボルト',
+  13119 => 'ホン',
+  13120 => 'ポンド',
+  13121 => 'ホール',
+  13122 => 'ホーン',
+  13123 => 'マイクロ',
+  13124 => 'マイル',
+  13125 => 'マッハ',
+  13126 => 'マルク',
+  13127 => 'マンション',
+  13128 => 'ミクロン',
+  13129 => 'ミリ',
+  13130 => 'ミリバール',
+  13131 => 'メガ',
+  13132 => 'メガトン',
+  13133 => 'メートル',
+  13134 => 'ヤード',
+  13135 => 'ヤール',
+  13136 => 'ユアン',
+  13137 => 'リットル',
+  13138 => 'リラ',
+  13139 => 'ルピー',
+  13140 => 'ルーブル',
+  13141 => 'レム',
+  13142 => 'レントゲン',
+  13143 => 'ワット',
+  13144 => '0点',
+  13145 => '1点',
+  13146 => '2点',
+  13147 => '3点',
+  13148 => '4点',
+  13149 => '5点',
+  13150 => '6点',
+  13151 => '7点',
+  13152 => '8点',
+  13153 => '9点',
+  13154 => '10点',
+  13155 => '11点',
+  13156 => '12点',
+  13157 => '13点',
+  13158 => '14点',
+  13159 => '15点',
+  13160 => '16点',
+  13161 => '17点',
+  13162 => '18点',
+  13163 => '19点',
+  13164 => '20点',
+  13165 => '21点',
+  13166 => '22点',
+  13167 => '23点',
+  13168 => '24点',
+  13169 => 'hpa',
+  13170 => 'da',
+  13171 => 'au',
+  13172 => 'bar',
+  13173 => 'ov',
+  13174 => 'pc',
+  13175 => 'dm',
+  13176 => 'dm2',
+  13177 => 'dm3',
+  13178 => 'iu',
+  13179 => '平成',
+  13180 => '昭和',
+  13181 => '大正',
+  13182 => '明治',
+  13183 => '株式会社',
+  13184 => 'pa',
+  13185 => 'na',
+  13186 => 'μa',
+  13187 => 'ma',
+  13188 => 'ka',
+  13189 => 'kb',
+  13190 => 'mb',
+  13191 => 'gb',
+  13192 => 'cal',
+  13193 => 'kcal',
+  13194 => 'pf',
+  13195 => 'nf',
+  13196 => 'μf',
+  13197 => 'μg',
+  13198 => 'mg',
+  13199 => 'kg',
+  13200 => 'hz',
+  13201 => 'khz',
+  13202 => 'mhz',
+  13203 => 'ghz',
+  13204 => 'thz',
+  13205 => 'μl',
+  13206 => 'ml',
+  13207 => 'dl',
+  13208 => 'kl',
+  13209 => 'fm',
+  13210 => 'nm',
+  13211 => 'μm',
+  13212 => 'mm',
+  13213 => 'cm',
+  13214 => 'km',
+  13215 => 'mm2',
+  13216 => 'cm2',
+  13217 => 'm2',
+  13218 => 'km2',
+  13219 => 'mm3',
+  13220 => 'cm3',
+  13221 => 'm3',
+  13222 => 'km3',
+  13223 => 'm∕s',
+  13224 => 'm∕s2',
+  13225 => 'pa',
+  13226 => 'kpa',
+  13227 => 'mpa',
+  13228 => 'gpa',
+  13229 => 'rad',
+  13230 => 'rad∕s',
+  13231 => 'rad∕s2',
+  13232 => 'ps',
+  13233 => 'ns',
+  13234 => 'μs',
+  13235 => 'ms',
+  13236 => 'pv',
+  13237 => 'nv',
+  13238 => 'μv',
+  13239 => 'mv',
+  13240 => 'kv',
+  13241 => 'mv',
+  13242 => 'pw',
+  13243 => 'nw',
+  13244 => 'μw',
+  13245 => 'mw',
+  13246 => 'kw',
+  13247 => 'mw',
+  13248 => 'kω',
+  13249 => 'mω',
+  13251 => 'bq',
+  13252 => 'cc',
+  13253 => 'cd',
+  13254 => 'c∕kg',
+  13256 => 'db',
+  13257 => 'gy',
+  13258 => 'ha',
+  13259 => 'hp',
+  13260 => 'in',
+  13261 => 'kk',
+  13262 => 'km',
+  13263 => 'kt',
+  13264 => 'lm',
+  13265 => 'ln',
+  13266 => 'log',
+  13267 => 'lx',
+  13268 => 'mb',
+  13269 => 'mil',
+  13270 => 'mol',
+  13271 => 'ph',
+  13273 => 'ppm',
+  13274 => 'pr',
+  13275 => 'sr',
+  13276 => 'sv',
+  13277 => 'wb',
+  13278 => 'v∕m',
+  13279 => 'a∕m',
+  13280 => '1日',
+  13281 => '2日',
+  13282 => '3日',
+  13283 => '4日',
+  13284 => '5日',
+  13285 => '6日',
+  13286 => '7日',
+  13287 => '8日',
+  13288 => '9日',
+  13289 => '10日',
+  13290 => '11日',
+  13291 => '12日',
+  13292 => '13日',
+  13293 => '14日',
+  13294 => '15日',
+  13295 => '16日',
+  13296 => '17日',
+  13297 => '18日',
+  13298 => '19日',
+  13299 => '20日',
+  13300 => '21日',
+  13301 => '22日',
+  13302 => '23日',
+  13303 => '24日',
+  13304 => '25日',
+  13305 => '26日',
+  13306 => '27日',
+  13307 => '28日',
+  13308 => '29日',
+  13309 => '30日',
+  13310 => '31日',
+  13311 => 'gal',
+  42560 => 'ꙁ',
+  42562 => 'ꙃ',
+  42564 => 'ꙅ',
+  42566 => 'ꙇ',
+  42568 => 'ꙉ',
+  42570 => 'ꙋ',
+  42572 => 'ꙍ',
+  42574 => 'ꙏ',
+  42576 => 'ꙑ',
+  42578 => 'ꙓ',
+  42580 => 'ꙕ',
+  42582 => 'ꙗ',
+  42584 => 'ꙙ',
+  42586 => 'ꙛ',
+  42588 => 'ꙝ',
+  42590 => 'ꙟ',
+  42592 => 'ꙡ',
+  42594 => 'ꙣ',
+  42596 => 'ꙥ',
+  42598 => 'ꙧ',
+  42600 => 'ꙩ',
+  42602 => 'ꙫ',
+  42604 => 'ꙭ',
+  42624 => 'ꚁ',
+  42626 => 'ꚃ',
+  42628 => 'ꚅ',
+  42630 => 'ꚇ',
+  42632 => 'ꚉ',
+  42634 => 'ꚋ',
+  42636 => 'ꚍ',
+  42638 => 'ꚏ',
+  42640 => 'ꚑ',
+  42642 => 'ꚓ',
+  42644 => 'ꚕ',
+  42646 => 'ꚗ',
+  42648 => 'ꚙ',
+  42650 => 'ꚛ',
+  42652 => 'ъ',
+  42653 => 'ь',
+  42786 => 'ꜣ',
+  42788 => 'ꜥ',
+  42790 => 'ꜧ',
+  42792 => 'ꜩ',
+  42794 => 'ꜫ',
+  42796 => 'ꜭ',
+  42798 => 'ꜯ',
+  42802 => 'ꜳ',
+  42804 => 'ꜵ',
+  42806 => 'ꜷ',
+  42808 => 'ꜹ',
+  42810 => 'ꜻ',
+  42812 => 'ꜽ',
+  42814 => 'ꜿ',
+  42816 => 'ꝁ',
+  42818 => 'ꝃ',
+  42820 => 'ꝅ',
+  42822 => 'ꝇ',
+  42824 => 'ꝉ',
+  42826 => 'ꝋ',
+  42828 => 'ꝍ',
+  42830 => 'ꝏ',
+  42832 => 'ꝑ',
+  42834 => 'ꝓ',
+  42836 => 'ꝕ',
+  42838 => 'ꝗ',
+  42840 => 'ꝙ',
+  42842 => 'ꝛ',
+  42844 => 'ꝝ',
+  42846 => 'ꝟ',
+  42848 => 'ꝡ',
+  42850 => 'ꝣ',
+  42852 => 'ꝥ',
+  42854 => 'ꝧ',
+  42856 => 'ꝩ',
+  42858 => 'ꝫ',
+  42860 => 'ꝭ',
+  42862 => 'ꝯ',
+  42864 => 'ꝯ',
+  42873 => 'ꝺ',
+  42875 => 'ꝼ',
+  42877 => 'ᵹ',
+  42878 => 'ꝿ',
+  42880 => 'ꞁ',
+  42882 => 'ꞃ',
+  42884 => 'ꞅ',
+  42886 => 'ꞇ',
+  42891 => 'ꞌ',
+  42893 => 'ɥ',
+  42896 => 'ꞑ',
+  42898 => 'ꞓ',
+  42902 => 'ꞗ',
+  42904 => 'ꞙ',
+  42906 => 'ꞛ',
+  42908 => 'ꞝ',
+  42910 => 'ꞟ',
+  42912 => 'ꞡ',
+  42914 => 'ꞣ',
+  42916 => 'ꞥ',
+  42918 => 'ꞧ',
+  42920 => 'ꞩ',
+  42922 => 'ɦ',
+  42923 => 'ɜ',
+  42924 => 'ɡ',
+  42925 => 'ɬ',
+  42926 => 'ɪ',
+  42928 => 'ʞ',
+  42929 => 'ʇ',
+  42930 => 'ʝ',
+  42931 => 'ꭓ',
+  42932 => 'ꞵ',
+  42934 => 'ꞷ',
+  42936 => 'ꞹ',
+  42938 => 'ꞻ',
+  42940 => 'ꞽ',
+  42942 => 'ꞿ',
+  42946 => 'ꟃ',
+  42948 => 'ꞔ',
+  42949 => 'ʂ',
+  42950 => 'ᶎ',
+  42951 => 'ꟈ',
+  42953 => 'ꟊ',
+  42997 => 'ꟶ',
+  43000 => 'ħ',
+  43001 => 'œ',
+  43868 => 'ꜧ',
+  43869 => 'ꬷ',
+  43870 => 'ɫ',
+  43871 => 'ꭒ',
+  43881 => 'ʍ',
+  43888 => 'Ꭰ',
+  43889 => 'Ꭱ',
+  43890 => 'Ꭲ',
+  43891 => 'Ꭳ',
+  43892 => 'Ꭴ',
+  43893 => 'Ꭵ',
+  43894 => 'Ꭶ',
+  43895 => 'Ꭷ',
+  43896 => 'Ꭸ',
+  43897 => 'Ꭹ',
+  43898 => 'Ꭺ',
+  43899 => 'Ꭻ',
+  43900 => 'Ꭼ',
+  43901 => 'Ꭽ',
+  43902 => 'Ꭾ',
+  43903 => 'Ꭿ',
+  43904 => 'Ꮀ',
+  43905 => 'Ꮁ',
+  43906 => 'Ꮂ',
+  43907 => 'Ꮃ',
+  43908 => 'Ꮄ',
+  43909 => 'Ꮅ',
+  43910 => 'Ꮆ',
+  43911 => 'Ꮇ',
+  43912 => 'Ꮈ',
+  43913 => 'Ꮉ',
+  43914 => 'Ꮊ',
+  43915 => 'Ꮋ',
+  43916 => 'Ꮌ',
+  43917 => 'Ꮍ',
+  43918 => 'Ꮎ',
+  43919 => 'Ꮏ',
+  43920 => 'Ꮐ',
+  43921 => 'Ꮑ',
+  43922 => 'Ꮒ',
+  43923 => 'Ꮓ',
+  43924 => 'Ꮔ',
+  43925 => 'Ꮕ',
+  43926 => 'Ꮖ',
+  43927 => 'Ꮗ',
+  43928 => 'Ꮘ',
+  43929 => 'Ꮙ',
+  43930 => 'Ꮚ',
+  43931 => 'Ꮛ',
+  43932 => 'Ꮜ',
+  43933 => 'Ꮝ',
+  43934 => 'Ꮞ',
+  43935 => 'Ꮟ',
+  43936 => 'Ꮠ',
+  43937 => 'Ꮡ',
+  43938 => 'Ꮢ',
+  43939 => 'Ꮣ',
+  43940 => 'Ꮤ',
+  43941 => 'Ꮥ',
+  43942 => 'Ꮦ',
+  43943 => 'Ꮧ',
+  43944 => 'Ꮨ',
+  43945 => 'Ꮩ',
+  43946 => 'Ꮪ',
+  43947 => 'Ꮫ',
+  43948 => 'Ꮬ',
+  43949 => 'Ꮭ',
+  43950 => 'Ꮮ',
+  43951 => 'Ꮯ',
+  43952 => 'Ꮰ',
+  43953 => 'Ꮱ',
+  43954 => 'Ꮲ',
+  43955 => 'Ꮳ',
+  43956 => 'Ꮴ',
+  43957 => 'Ꮵ',
+  43958 => 'Ꮶ',
+  43959 => 'Ꮷ',
+  43960 => 'Ꮸ',
+  43961 => 'Ꮹ',
+  43962 => 'Ꮺ',
+  43963 => 'Ꮻ',
+  43964 => 'Ꮼ',
+  43965 => 'Ꮽ',
+  43966 => 'Ꮾ',
+  43967 => 'Ꮿ',
+  63744 => '豈',
+  63745 => '更',
+  63746 => '車',
+  63747 => '賈',
+  63748 => '滑',
+  63749 => '串',
+  63750 => '句',
+  63751 => '龜',
+  63752 => '龜',
+  63753 => '契',
+  63754 => '金',
+  63755 => '喇',
+  63756 => '奈',
+  63757 => '懶',
+  63758 => '癩',
+  63759 => '羅',
+  63760 => '蘿',
+  63761 => '螺',
+  63762 => '裸',
+  63763 => '邏',
+  63764 => '樂',
+  63765 => '洛',
+  63766 => '烙',
+  63767 => '珞',
+  63768 => '落',
+  63769 => '酪',
+  63770 => '駱',
+  63771 => '亂',
+  63772 => '卵',
+  63773 => '欄',
+  63774 => '爛',
+  63775 => '蘭',
+  63776 => '鸞',
+  63777 => '嵐',
+  63778 => '濫',
+  63779 => '藍',
+  63780 => '襤',
+  63781 => '拉',
+  63782 => '臘',
+  63783 => '蠟',
+  63784 => '廊',
+  63785 => '朗',
+  63786 => '浪',
+  63787 => '狼',
+  63788 => '郎',
+  63789 => '來',
+  63790 => '冷',
+  63791 => '勞',
+  63792 => '擄',
+  63793 => '櫓',
+  63794 => '爐',
+  63795 => '盧',
+  63796 => '老',
+  63797 => '蘆',
+  63798 => '虜',
+  63799 => '路',
+  63800 => '露',
+  63801 => '魯',
+  63802 => '鷺',
+  63803 => '碌',
+  63804 => '祿',
+  63805 => '綠',
+  63806 => '菉',
+  63807 => '錄',
+  63808 => '鹿',
+  63809 => '論',
+  63810 => '壟',
+  63811 => '弄',
+  63812 => '籠',
+  63813 => '聾',
+  63814 => '牢',
+  63815 => '磊',
+  63816 => '賂',
+  63817 => '雷',
+  63818 => '壘',
+  63819 => '屢',
+  63820 => '樓',
+  63821 => '淚',
+  63822 => '漏',
+  63823 => '累',
+  63824 => '縷',
+  63825 => '陋',
+  63826 => '勒',
+  63827 => '肋',
+  63828 => '凜',
+  63829 => '凌',
+  63830 => '稜',
+  63831 => '綾',
+  63832 => '菱',
+  63833 => '陵',
+  63834 => '讀',
+  63835 => '拏',
+  63836 => '樂',
+  63837 => '諾',
+  63838 => '丹',
+  63839 => '寧',
+  63840 => '怒',
+  63841 => '率',
+  63842 => '異',
+  63843 => '北',
+  63844 => '磻',
+  63845 => '便',
+  63846 => '復',
+  63847 => '不',
+  63848 => '泌',
+  63849 => '數',
+  63850 => '索',
+  63851 => '參',
+  63852 => '塞',
+  63853 => '省',
+  63854 => '葉',
+  63855 => '說',
+  63856 => '殺',
+  63857 => '辰',
+  63858 => '沈',
+  63859 => '拾',
+  63860 => '若',
+  63861 => '掠',
+  63862 => '略',
+  63863 => '亮',
+  63864 => '兩',
+  63865 => '凉',
+  63866 => '梁',
+  63867 => '糧',
+  63868 => '良',
+  63869 => '諒',
+  63870 => '量',
+  63871 => '勵',
+  63872 => '呂',
+  63873 => '女',
+  63874 => '廬',
+  63875 => '旅',
+  63876 => '濾',
+  63877 => '礪',
+  63878 => '閭',
+  63879 => '驪',
+  63880 => '麗',
+  63881 => '黎',
+  63882 => '力',
+  63883 => '曆',
+  63884 => '歷',
+  63885 => '轢',
+  63886 => '年',
+  63887 => '憐',
+  63888 => '戀',
+  63889 => '撚',
+  63890 => '漣',
+  63891 => '煉',
+  63892 => '璉',
+  63893 => '秊',
+  63894 => '練',
+  63895 => '聯',
+  63896 => '輦',
+  63897 => '蓮',
+  63898 => '連',
+  63899 => '鍊',
+  63900 => '列',
+  63901 => '劣',
+  63902 => '咽',
+  63903 => '烈',
+  63904 => '裂',
+  63905 => '說',
+  63906 => '廉',
+  63907 => '念',
+  63908 => '捻',
+  63909 => '殮',
+  63910 => '簾',
+  63911 => '獵',
+  63912 => '令',
+  63913 => '囹',
+  63914 => '寧',
+  63915 => '嶺',
+  63916 => '怜',
+  63917 => '玲',
+  63918 => '瑩',
+  63919 => '羚',
+  63920 => '聆',
+  63921 => '鈴',
+  63922 => '零',
+  63923 => '靈',
+  63924 => '領',
+  63925 => '例',
+  63926 => '禮',
+  63927 => '醴',
+  63928 => '隸',
+  63929 => '惡',
+  63930 => '了',
+  63931 => '僚',
+  63932 => '寮',
+  63933 => '尿',
+  63934 => '料',
+  63935 => '樂',
+  63936 => '燎',
+  63937 => '療',
+  63938 => '蓼',
+  63939 => '遼',
+  63940 => '龍',
+  63941 => '暈',
+  63942 => '阮',
+  63943 => '劉',
+  63944 => '杻',
+  63945 => '柳',
+  63946 => '流',
+  63947 => '溜',
+  63948 => '琉',
+  63949 => '留',
+  63950 => '硫',
+  63951 => '紐',
+  63952 => '類',
+  63953 => '六',
+  63954 => '戮',
+  63955 => '陸',
+  63956 => '倫',
+  63957 => '崙',
+  63958 => '淪',
+  63959 => '輪',
+  63960 => '律',
+  63961 => '慄',
+  63962 => '栗',
+  63963 => '率',
+  63964 => '隆',
+  63965 => '利',
+  63966 => '吏',
+  63967 => '履',
+  63968 => '易',
+  63969 => '李',
+  63970 => '梨',
+  63971 => '泥',
+  63972 => '理',
+  63973 => '痢',
+  63974 => '罹',
+  63975 => '裏',
+  63976 => '裡',
+  63977 => '里',
+  63978 => '離',
+  63979 => '匿',
+  63980 => '溺',
+  63981 => '吝',
+  63982 => '燐',
+  63983 => '璘',
+  63984 => '藺',
+  63985 => '隣',
+  63986 => '鱗',
+  63987 => '麟',
+  63988 => '林',
+  63989 => '淋',
+  63990 => '臨',
+  63991 => '立',
+  63992 => '笠',
+  63993 => '粒',
+  63994 => '狀',
+  63995 => '炙',
+  63996 => '識',
+  63997 => '什',
+  63998 => '茶',
+  63999 => '刺',
+  64000 => '切',
+  64001 => '度',
+  64002 => '拓',
+  64003 => '糖',
+  64004 => '宅',
+  64005 => '洞',
+  64006 => '暴',
+  64007 => '輻',
+  64008 => '行',
+  64009 => '降',
+  64010 => '見',
+  64011 => '廓',
+  64012 => '兀',
+  64013 => '嗀',
+  64016 => '塚',
+  64018 => '晴',
+  64021 => '凞',
+  64022 => '猪',
+  64023 => '益',
+  64024 => '礼',
+  64025 => '神',
+  64026 => '祥',
+  64027 => '福',
+  64028 => '靖',
+  64029 => '精',
+  64030 => '羽',
+  64032 => '蘒',
+  64034 => '諸',
+  64037 => '逸',
+  64038 => '都',
+  64042 => '飯',
+  64043 => '飼',
+  64044 => '館',
+  64045 => '鶴',
+  64046 => '郞',
+  64047 => '隷',
+  64048 => '侮',
+  64049 => '僧',
+  64050 => '免',
+  64051 => '勉',
+  64052 => '勤',
+  64053 => '卑',
+  64054 => '喝',
+  64055 => '嘆',
+  64056 => '器',
+  64057 => '塀',
+  64058 => '墨',
+  64059 => '層',
+  64060 => '屮',
+  64061 => '悔',
+  64062 => '慨',
+  64063 => '憎',
+  64064 => '懲',
+  64065 => '敏',
+  64066 => '既',
+  64067 => '暑',
+  64068 => '梅',
+  64069 => '海',
+  64070 => '渚',
+  64071 => '漢',
+  64072 => '煮',
+  64073 => '爫',
+  64074 => '琢',
+  64075 => '碑',
+  64076 => '社',
+  64077 => '祉',
+  64078 => '祈',
+  64079 => '祐',
+  64080 => '祖',
+  64081 => '祝',
+  64082 => '禍',
+  64083 => '禎',
+  64084 => '穀',
+  64085 => '突',
+  64086 => '節',
+  64087 => '練',
+  64088 => '縉',
+  64089 => '繁',
+  64090 => '署',
+  64091 => '者',
+  64092 => '臭',
+  64093 => '艹',
+  64094 => '艹',
+  64095 => '著',
+  64096 => '褐',
+  64097 => '視',
+  64098 => '謁',
+  64099 => '謹',
+  64100 => '賓',
+  64101 => '贈',
+  64102 => '辶',
+  64103 => '逸',
+  64104 => '難',
+  64105 => '響',
+  64106 => '頻',
+  64107 => '恵',
+  64108 => '𤋮',
+  64109 => '舘',
+  64112 => '並',
+  64113 => '况',
+  64114 => '全',
+  64115 => '侀',
+  64116 => '充',
+  64117 => '冀',
+  64118 => '勇',
+  64119 => '勺',
+  64120 => '喝',
+  64121 => '啕',
+  64122 => '喙',
+  64123 => '嗢',
+  64124 => '塚',
+  64125 => '墳',
+  64126 => '奄',
+  64127 => '奔',
+  64128 => '婢',
+  64129 => '嬨',
+  64130 => '廒',
+  64131 => '廙',
+  64132 => '彩',
+  64133 => '徭',
+  64134 => '惘',
+  64135 => '慎',
+  64136 => '愈',
+  64137 => '憎',
+  64138 => '慠',
+  64139 => '懲',
+  64140 => '戴',
+  64141 => '揄',
+  64142 => '搜',
+  64143 => '摒',
+  64144 => '敖',
+  64145 => '晴',
+  64146 => '朗',
+  64147 => '望',
+  64148 => '杖',
+  64149 => '歹',
+  64150 => '殺',
+  64151 => '流',
+  64152 => '滛',
+  64153 => '滋',
+  64154 => '漢',
+  64155 => '瀞',
+  64156 => '煮',
+  64157 => '瞧',
+  64158 => '爵',
+  64159 => '犯',
+  64160 => '猪',
+  64161 => '瑱',
+  64162 => '甆',
+  64163 => '画',
+  64164 => '瘝',
+  64165 => '瘟',
+  64166 => '益',
+  64167 => '盛',
+  64168 => '直',
+  64169 => '睊',
+  64170 => '着',
+  64171 => '磌',
+  64172 => '窱',
+  64173 => '節',
+  64174 => '类',
+  64175 => '絛',
+  64176 => '練',
+  64177 => '缾',
+  64178 => '者',
+  64179 => '荒',
+  64180 => '華',
+  64181 => '蝹',
+  64182 => '襁',
+  64183 => '覆',
+  64184 => '視',
+  64185 => '調',
+  64186 => '諸',
+  64187 => '請',
+  64188 => '謁',
+  64189 => '諾',
+  64190 => '諭',
+  64191 => '謹',
+  64192 => '變',
+  64193 => '贈',
+  64194 => '輸',
+  64195 => '遲',
+  64196 => '醙',
+  64197 => '鉶',
+  64198 => '陼',
+  64199 => '難',
+  64200 => '靖',
+  64201 => '韛',
+  64202 => '響',
+  64203 => '頋',
+  64204 => '頻',
+  64205 => '鬒',
+  64206 => '龜',
+  64207 => '𢡊',
+  64208 => '𢡄',
+  64209 => '𣏕',
+  64210 => '㮝',
+  64211 => '䀘',
+  64212 => '䀹',
+  64213 => '𥉉',
+  64214 => '𥳐',
+  64215 => '𧻓',
+  64216 => '齃',
+  64217 => '龎',
+  64256 => 'ff',
+  64257 => 'fi',
+  64258 => 'fl',
+  64259 => 'ffi',
+  64260 => 'ffl',
+  64261 => 'st',
+  64262 => 'st',
+  64275 => 'մն',
+  64276 => 'մե',
+  64277 => 'մի',
+  64278 => 'վն',
+  64279 => 'մխ',
+  64285 => 'יִ',
+  64287 => 'ײַ',
+  64288 => 'ע',
+  64289 => 'א',
+  64290 => 'ד',
+  64291 => 'ה',
+  64292 => 'כ',
+  64293 => 'ל',
+  64294 => 'ם',
+  64295 => 'ר',
+  64296 => 'ת',
+  64298 => 'שׁ',
+  64299 => 'שׂ',
+  64300 => 'שּׁ',
+  64301 => 'שּׂ',
+  64302 => 'אַ',
+  64303 => 'אָ',
+  64304 => 'אּ',
+  64305 => 'בּ',
+  64306 => 'גּ',
+  64307 => 'דּ',
+  64308 => 'הּ',
+  64309 => 'וּ',
+  64310 => 'זּ',
+  64312 => 'טּ',
+  64313 => 'יּ',
+  64314 => 'ךּ',
+  64315 => 'כּ',
+  64316 => 'לּ',
+  64318 => 'מּ',
+  64320 => 'נּ',
+  64321 => 'סּ',
+  64323 => 'ףּ',
+  64324 => 'פּ',
+  64326 => 'צּ',
+  64327 => 'קּ',
+  64328 => 'רּ',
+  64329 => 'שּ',
+  64330 => 'תּ',
+  64331 => 'וֹ',
+  64332 => 'בֿ',
+  64333 => 'כֿ',
+  64334 => 'פֿ',
+  64335 => 'אל',
+  64336 => 'ٱ',
+  64337 => 'ٱ',
+  64338 => 'ٻ',
+  64339 => 'ٻ',
+  64340 => 'ٻ',
+  64341 => 'ٻ',
+  64342 => 'پ',
+  64343 => 'پ',
+  64344 => 'پ',
+  64345 => 'پ',
+  64346 => 'ڀ',
+  64347 => 'ڀ',
+  64348 => 'ڀ',
+  64349 => 'ڀ',
+  64350 => 'ٺ',
+  64351 => 'ٺ',
+  64352 => 'ٺ',
+  64353 => 'ٺ',
+  64354 => 'ٿ',
+  64355 => 'ٿ',
+  64356 => 'ٿ',
+  64357 => 'ٿ',
+  64358 => 'ٹ',
+  64359 => 'ٹ',
+  64360 => 'ٹ',
+  64361 => 'ٹ',
+  64362 => 'ڤ',
+  64363 => 'ڤ',
+  64364 => 'ڤ',
+  64365 => 'ڤ',
+  64366 => 'ڦ',
+  64367 => 'ڦ',
+  64368 => 'ڦ',
+  64369 => 'ڦ',
+  64370 => 'ڄ',
+  64371 => 'ڄ',
+  64372 => 'ڄ',
+  64373 => 'ڄ',
+  64374 => 'ڃ',
+  64375 => 'ڃ',
+  64376 => 'ڃ',
+  64377 => 'ڃ',
+  64378 => 'چ',
+  64379 => 'چ',
+  64380 => 'چ',
+  64381 => 'چ',
+  64382 => 'ڇ',
+  64383 => 'ڇ',
+  64384 => 'ڇ',
+  64385 => 'ڇ',
+  64386 => 'ڍ',
+  64387 => 'ڍ',
+  64388 => 'ڌ',
+  64389 => 'ڌ',
+  64390 => 'ڎ',
+  64391 => 'ڎ',
+  64392 => 'ڈ',
+  64393 => 'ڈ',
+  64394 => 'ژ',
+  64395 => 'ژ',
+  64396 => 'ڑ',
+  64397 => 'ڑ',
+  64398 => 'ک',
+  64399 => 'ک',
+  64400 => 'ک',
+  64401 => 'ک',
+  64402 => 'گ',
+  64403 => 'گ',
+  64404 => 'گ',
+  64405 => 'گ',
+  64406 => 'ڳ',
+  64407 => 'ڳ',
+  64408 => 'ڳ',
+  64409 => 'ڳ',
+  64410 => 'ڱ',
+  64411 => 'ڱ',
+  64412 => 'ڱ',
+  64413 => 'ڱ',
+  64414 => 'ں',
+  64415 => 'ں',
+  64416 => 'ڻ',
+  64417 => 'ڻ',
+  64418 => 'ڻ',
+  64419 => 'ڻ',
+  64420 => 'ۀ',
+  64421 => 'ۀ',
+  64422 => 'ہ',
+  64423 => 'ہ',
+  64424 => 'ہ',
+  64425 => 'ہ',
+  64426 => 'ھ',
+  64427 => 'ھ',
+  64428 => 'ھ',
+  64429 => 'ھ',
+  64430 => 'ے',
+  64431 => 'ے',
+  64432 => 'ۓ',
+  64433 => 'ۓ',
+  64467 => 'ڭ',
+  64468 => 'ڭ',
+  64469 => 'ڭ',
+  64470 => 'ڭ',
+  64471 => 'ۇ',
+  64472 => 'ۇ',
+  64473 => 'ۆ',
+  64474 => 'ۆ',
+  64475 => 'ۈ',
+  64476 => 'ۈ',
+  64477 => 'ۇٴ',
+  64478 => 'ۋ',
+  64479 => 'ۋ',
+  64480 => 'ۅ',
+  64481 => 'ۅ',
+  64482 => 'ۉ',
+  64483 => 'ۉ',
+  64484 => 'ې',
+  64485 => 'ې',
+  64486 => 'ې',
+  64487 => 'ې',
+  64488 => 'ى',
+  64489 => 'ى',
+  64490 => 'ئا',
+  64491 => 'ئا',
+  64492 => 'ئە',
+  64493 => 'ئە',
+  64494 => 'ئو',
+  64495 => 'ئو',
+  64496 => 'ئۇ',
+  64497 => 'ئۇ',
+  64498 => 'ئۆ',
+  64499 => 'ئۆ',
+  64500 => 'ئۈ',
+  64501 => 'ئۈ',
+  64502 => 'ئې',
+  64503 => 'ئې',
+  64504 => 'ئې',
+  64505 => 'ئى',
+  64506 => 'ئى',
+  64507 => 'ئى',
+  64508 => 'ی',
+  64509 => 'ی',
+  64510 => 'ی',
+  64511 => 'ی',
+  64512 => 'ئج',
+  64513 => 'ئح',
+  64514 => 'ئم',
+  64515 => 'ئى',
+  64516 => 'ئي',
+  64517 => 'بج',
+  64518 => 'بح',
+  64519 => 'بخ',
+  64520 => 'بم',
+  64521 => 'بى',
+  64522 => 'بي',
+  64523 => 'تج',
+  64524 => 'تح',
+  64525 => 'تخ',
+  64526 => 'تم',
+  64527 => 'تى',
+  64528 => 'تي',
+  64529 => 'ثج',
+  64530 => 'ثم',
+  64531 => 'ثى',
+  64532 => 'ثي',
+  64533 => 'جح',
+  64534 => 'جم',
+  64535 => 'حج',
+  64536 => 'حم',
+  64537 => 'خج',
+  64538 => 'خح',
+  64539 => 'خم',
+  64540 => 'سج',
+  64541 => 'سح',
+  64542 => 'سخ',
+  64543 => 'سم',
+  64544 => 'صح',
+  64545 => 'صم',
+  64546 => 'ضج',
+  64547 => 'ضح',
+  64548 => 'ضخ',
+  64549 => 'ضم',
+  64550 => 'طح',
+  64551 => 'طم',
+  64552 => 'ظم',
+  64553 => 'عج',
+  64554 => 'عم',
+  64555 => 'غج',
+  64556 => 'غم',
+  64557 => 'فج',
+  64558 => 'فح',
+  64559 => 'فخ',
+  64560 => 'فم',
+  64561 => 'فى',
+  64562 => 'في',
+  64563 => 'قح',
+  64564 => 'قم',
+  64565 => 'قى',
+  64566 => 'قي',
+  64567 => 'كا',
+  64568 => 'كج',
+  64569 => 'كح',
+  64570 => 'كخ',
+  64571 => 'كل',
+  64572 => 'كم',
+  64573 => 'كى',
+  64574 => 'كي',
+  64575 => 'لج',
+  64576 => 'لح',
+  64577 => 'لخ',
+  64578 => 'لم',
+  64579 => 'لى',
+  64580 => 'لي',
+  64581 => 'مج',
+  64582 => 'مح',
+  64583 => 'مخ',
+  64584 => 'مم',
+  64585 => 'مى',
+  64586 => 'مي',
+  64587 => 'نج',
+  64588 => 'نح',
+  64589 => 'نخ',
+  64590 => 'نم',
+  64591 => 'نى',
+  64592 => 'ني',
+  64593 => 'هج',
+  64594 => 'هم',
+  64595 => 'هى',
+  64596 => 'هي',
+  64597 => 'يج',
+  64598 => 'يح',
+  64599 => 'يخ',
+  64600 => 'يم',
+  64601 => 'يى',
+  64602 => 'يي',
+  64603 => 'ذٰ',
+  64604 => 'رٰ',
+  64605 => 'ىٰ',
+  64612 => 'ئر',
+  64613 => 'ئز',
+  64614 => 'ئم',
+  64615 => 'ئن',
+  64616 => 'ئى',
+  64617 => 'ئي',
+  64618 => 'بر',
+  64619 => 'بز',
+  64620 => 'بم',
+  64621 => 'بن',
+  64622 => 'بى',
+  64623 => 'بي',
+  64624 => 'تر',
+  64625 => 'تز',
+  64626 => 'تم',
+  64627 => 'تن',
+  64628 => 'تى',
+  64629 => 'تي',
+  64630 => 'ثر',
+  64631 => 'ثز',
+  64632 => 'ثم',
+  64633 => 'ثن',
+  64634 => 'ثى',
+  64635 => 'ثي',
+  64636 => 'فى',
+  64637 => 'في',
+  64638 => 'قى',
+  64639 => 'قي',
+  64640 => 'كا',
+  64641 => 'كل',
+  64642 => 'كم',
+  64643 => 'كى',
+  64644 => 'كي',
+  64645 => 'لم',
+  64646 => 'لى',
+  64647 => 'لي',
+  64648 => 'ما',
+  64649 => 'مم',
+  64650 => 'نر',
+  64651 => 'نز',
+  64652 => 'نم',
+  64653 => 'نن',
+  64654 => 'نى',
+  64655 => 'ني',
+  64656 => 'ىٰ',
+  64657 => 'ير',
+  64658 => 'يز',
+  64659 => 'يم',
+  64660 => 'ين',
+  64661 => 'يى',
+  64662 => 'يي',
+  64663 => 'ئج',
+  64664 => 'ئح',
+  64665 => 'ئخ',
+  64666 => 'ئم',
+  64667 => 'ئه',
+  64668 => 'بج',
+  64669 => 'بح',
+  64670 => 'بخ',
+  64671 => 'بم',
+  64672 => 'به',
+  64673 => 'تج',
+  64674 => 'تح',
+  64675 => 'تخ',
+  64676 => 'تم',
+  64677 => 'ته',
+  64678 => 'ثم',
+  64679 => 'جح',
+  64680 => 'جم',
+  64681 => 'حج',
+  64682 => 'حم',
+  64683 => 'خج',
+  64684 => 'خم',
+  64685 => 'سج',
+  64686 => 'سح',
+  64687 => 'سخ',
+  64688 => 'سم',
+  64689 => 'صح',
+  64690 => 'صخ',
+  64691 => 'صم',
+  64692 => 'ضج',
+  64693 => 'ضح',
+  64694 => 'ضخ',
+  64695 => 'ضم',
+  64696 => 'طح',
+  64697 => 'ظم',
+  64698 => 'عج',
+  64699 => 'عم',
+  64700 => 'غج',
+  64701 => 'غم',
+  64702 => 'فج',
+  64703 => 'فح',
+  64704 => 'فخ',
+  64705 => 'فم',
+  64706 => 'قح',
+  64707 => 'قم',
+  64708 => 'كج',
+  64709 => 'كح',
+  64710 => 'كخ',
+  64711 => 'كل',
+  64712 => 'كم',
+  64713 => 'لج',
+  64714 => 'لح',
+  64715 => 'لخ',
+  64716 => 'لم',
+  64717 => 'له',
+  64718 => 'مج',
+  64719 => 'مح',
+  64720 => 'مخ',
+  64721 => 'مم',
+  64722 => 'نج',
+  64723 => 'نح',
+  64724 => 'نخ',
+  64725 => 'نم',
+  64726 => 'نه',
+  64727 => 'هج',
+  64728 => 'هم',
+  64729 => 'هٰ',
+  64730 => 'يج',
+  64731 => 'يح',
+  64732 => 'يخ',
+  64733 => 'يم',
+  64734 => 'يه',
+  64735 => 'ئم',
+  64736 => 'ئه',
+  64737 => 'بم',
+  64738 => 'به',
+  64739 => 'تم',
+  64740 => 'ته',
+  64741 => 'ثم',
+  64742 => 'ثه',
+  64743 => 'سم',
+  64744 => 'سه',
+  64745 => 'شم',
+  64746 => 'شه',
+  64747 => 'كل',
+  64748 => 'كم',
+  64749 => 'لم',
+  64750 => 'نم',
+  64751 => 'نه',
+  64752 => 'يم',
+  64753 => 'يه',
+  64754 => 'ـَّ',
+  64755 => 'ـُّ',
+  64756 => 'ـِّ',
+  64757 => 'طى',
+  64758 => 'طي',
+  64759 => 'عى',
+  64760 => 'عي',
+  64761 => 'غى',
+  64762 => 'غي',
+  64763 => 'سى',
+  64764 => 'سي',
+  64765 => 'شى',
+  64766 => 'شي',
+  64767 => 'حى',
+  64768 => 'حي',
+  64769 => 'جى',
+  64770 => 'جي',
+  64771 => 'خى',
+  64772 => 'خي',
+  64773 => 'صى',
+  64774 => 'صي',
+  64775 => 'ضى',
+  64776 => 'ضي',
+  64777 => 'شج',
+  64778 => 'شح',
+  64779 => 'شخ',
+  64780 => 'شم',
+  64781 => 'شر',
+  64782 => 'سر',
+  64783 => 'صر',
+  64784 => 'ضر',
+  64785 => 'طى',
+  64786 => 'طي',
+  64787 => 'عى',
+  64788 => 'عي',
+  64789 => 'غى',
+  64790 => 'غي',
+  64791 => 'سى',
+  64792 => 'سي',
+  64793 => 'شى',
+  64794 => 'شي',
+  64795 => 'حى',
+  64796 => 'حي',
+  64797 => 'جى',
+  64798 => 'جي',
+  64799 => 'خى',
+  64800 => 'خي',
+  64801 => 'صى',
+  64802 => 'صي',
+  64803 => 'ضى',
+  64804 => 'ضي',
+  64805 => 'شج',
+  64806 => 'شح',
+  64807 => 'شخ',
+  64808 => 'شم',
+  64809 => 'شر',
+  64810 => 'سر',
+  64811 => 'صر',
+  64812 => 'ضر',
+  64813 => 'شج',
+  64814 => 'شح',
+  64815 => 'شخ',
+  64816 => 'شم',
+  64817 => 'سه',
+  64818 => 'شه',
+  64819 => 'طم',
+  64820 => 'سج',
+  64821 => 'سح',
+  64822 => 'سخ',
+  64823 => 'شج',
+  64824 => 'شح',
+  64825 => 'شخ',
+  64826 => 'طم',
+  64827 => 'ظم',
+  64828 => 'اً',
+  64829 => 'اً',
+  64848 => 'تجم',
+  64849 => 'تحج',
+  64850 => 'تحج',
+  64851 => 'تحم',
+  64852 => 'تخم',
+  64853 => 'تمج',
+  64854 => 'تمح',
+  64855 => 'تمخ',
+  64856 => 'جمح',
+  64857 => 'جمح',
+  64858 => 'حمي',
+  64859 => 'حمى',
+  64860 => 'سحج',
+  64861 => 'سجح',
+  64862 => 'سجى',
+  64863 => 'سمح',
+  64864 => 'سمح',
+  64865 => 'سمج',
+  64866 => 'سمم',
+  64867 => 'سمم',
+  64868 => 'صحح',
+  64869 => 'صحح',
+  64870 => 'صمم',
+  64871 => 'شحم',
+  64872 => 'شحم',
+  64873 => 'شجي',
+  64874 => 'شمخ',
+  64875 => 'شمخ',
+  64876 => 'شمم',
+  64877 => 'شمم',
+  64878 => 'ضحى',
+  64879 => 'ضخم',
+  64880 => 'ضخم',
+  64881 => 'طمح',
+  64882 => 'طمح',
+  64883 => 'طمم',
+  64884 => 'طمي',
+  64885 => 'عجم',
+  64886 => 'عمم',
+  64887 => 'عمم',
+  64888 => 'عمى',
+  64889 => 'غمم',
+  64890 => 'غمي',
+  64891 => 'غمى',
+  64892 => 'فخم',
+  64893 => 'فخم',
+  64894 => 'قمح',
+  64895 => 'قمم',
+  64896 => 'لحم',
+  64897 => 'لحي',
+  64898 => 'لحى',
+  64899 => 'لجج',
+  64900 => 'لجج',
+  64901 => 'لخم',
+  64902 => 'لخم',
+  64903 => 'لمح',
+  64904 => 'لمح',
+  64905 => 'محج',
+  64906 => 'محم',
+  64907 => 'محي',
+  64908 => 'مجح',
+  64909 => 'مجم',
+  64910 => 'مخج',
+  64911 => 'مخم',
+  64914 => 'مجخ',
+  64915 => 'همج',
+  64916 => 'همم',
+  64917 => 'نحم',
+  64918 => 'نحى',
+  64919 => 'نجم',
+  64920 => 'نجم',
+  64921 => 'نجى',
+  64922 => 'نمي',
+  64923 => 'نمى',
+  64924 => 'يمم',
+  64925 => 'يمم',
+  64926 => 'بخي',
+  64927 => 'تجي',
+  64928 => 'تجى',
+  64929 => 'تخي',
+  64930 => 'تخى',
+  64931 => 'تمي',
+  64932 => 'تمى',
+  64933 => 'جمي',
+  64934 => 'جحى',
+  64935 => 'جمى',
+  64936 => 'سخى',
+  64937 => 'صحي',
+  64938 => 'شحي',
+  64939 => 'ضحي',
+  64940 => 'لجي',
+  64941 => 'لمي',
+  64942 => 'يحي',
+  64943 => 'يجي',
+  64944 => 'يمي',
+  64945 => 'ممي',
+  64946 => 'قمي',
+  64947 => 'نحي',
+  64948 => 'قمح',
+  64949 => 'لحم',
+  64950 => 'عمي',
+  64951 => 'كمي',
+  64952 => 'نجح',
+  64953 => 'مخي',
+  64954 => 'لجم',
+  64955 => 'كمم',
+  64956 => 'لجم',
+  64957 => 'نجح',
+  64958 => 'جحي',
+  64959 => 'حجي',
+  64960 => 'مجي',
+  64961 => 'فمي',
+  64962 => 'بحي',
+  64963 => 'كمم',
+  64964 => 'عجم',
+  64965 => 'صمم',
+  64966 => 'سخي',
+  64967 => 'نجي',
+  65008 => 'صلے',
+  65009 => 'قلے',
+  65010 => 'الله',
+  65011 => 'اكبر',
+  65012 => 'محمد',
+  65013 => 'صلعم',
+  65014 => 'رسول',
+  65015 => 'عليه',
+  65016 => 'وسلم',
+  65017 => 'صلى',
+  65020 => 'ریال',
+  65041 => '、',
+  65047 => '〖',
+  65048 => '〗',
+  65073 => '—',
+  65074 => '–',
+  65081 => '〔',
+  65082 => '〕',
+  65083 => '【',
+  65084 => '】',
+  65085 => '《',
+  65086 => '》',
+  65087 => '〈',
+  65088 => '〉',
+  65089 => '「',
+  65090 => '」',
+  65091 => '『',
+  65092 => '』',
+  65105 => '、',
+  65112 => '—',
+  65117 => '〔',
+  65118 => '〕',
+  65123 => '-',
+  65137 => 'ـً',
+  65143 => 'ـَ',
+  65145 => 'ـُ',
+  65147 => 'ـِ',
+  65149 => 'ـّ',
+  65151 => 'ـْ',
+  65152 => 'ء',
+  65153 => 'آ',
+  65154 => 'آ',
+  65155 => 'أ',
+  65156 => 'أ',
+  65157 => 'ؤ',
+  65158 => 'ؤ',
+  65159 => 'إ',
+  65160 => 'إ',
+  65161 => 'ئ',
+  65162 => 'ئ',
+  65163 => 'ئ',
+  65164 => 'ئ',
+  65165 => 'ا',
+  65166 => 'ا',
+  65167 => 'ب',
+  65168 => 'ب',
+  65169 => 'ب',
+  65170 => 'ب',
+  65171 => 'ة',
+  65172 => 'ة',
+  65173 => 'ت',
+  65174 => 'ت',
+  65175 => 'ت',
+  65176 => 'ت',
+  65177 => 'ث',
+  65178 => 'ث',
+  65179 => 'ث',
+  65180 => 'ث',
+  65181 => 'ج',
+  65182 => 'ج',
+  65183 => 'ج',
+  65184 => 'ج',
+  65185 => 'ح',
+  65186 => 'ح',
+  65187 => 'ح',
+  65188 => 'ح',
+  65189 => 'خ',
+  65190 => 'خ',
+  65191 => 'خ',
+  65192 => 'خ',
+  65193 => 'د',
+  65194 => 'د',
+  65195 => 'ذ',
+  65196 => 'ذ',
+  65197 => 'ر',
+  65198 => 'ر',
+  65199 => 'ز',
+  65200 => 'ز',
+  65201 => 'س',
+  65202 => 'س',
+  65203 => 'س',
+  65204 => 'س',
+  65205 => 'ش',
+  65206 => 'ش',
+  65207 => 'ش',
+  65208 => 'ش',
+  65209 => 'ص',
+  65210 => 'ص',
+  65211 => 'ص',
+  65212 => 'ص',
+  65213 => 'ض',
+  65214 => 'ض',
+  65215 => 'ض',
+  65216 => 'ض',
+  65217 => 'ط',
+  65218 => 'ط',
+  65219 => 'ط',
+  65220 => 'ط',
+  65221 => 'ظ',
+  65222 => 'ظ',
+  65223 => 'ظ',
+  65224 => 'ظ',
+  65225 => 'ع',
+  65226 => 'ع',
+  65227 => 'ع',
+  65228 => 'ع',
+  65229 => 'غ',
+  65230 => 'غ',
+  65231 => 'غ',
+  65232 => 'غ',
+  65233 => 'ف',
+  65234 => 'ف',
+  65235 => 'ف',
+  65236 => 'ف',
+  65237 => 'ق',
+  65238 => 'ق',
+  65239 => 'ق',
+  65240 => 'ق',
+  65241 => 'ك',
+  65242 => 'ك',
+  65243 => 'ك',
+  65244 => 'ك',
+  65245 => 'ل',
+  65246 => 'ل',
+  65247 => 'ل',
+  65248 => 'ل',
+  65249 => 'م',
+  65250 => 'م',
+  65251 => 'م',
+  65252 => 'م',
+  65253 => 'ن',
+  65254 => 'ن',
+  65255 => 'ن',
+  65256 => 'ن',
+  65257 => 'ه',
+  65258 => 'ه',
+  65259 => 'ه',
+  65260 => 'ه',
+  65261 => 'و',
+  65262 => 'و',
+  65263 => 'ى',
+  65264 => 'ى',
+  65265 => 'ي',
+  65266 => 'ي',
+  65267 => 'ي',
+  65268 => 'ي',
+  65269 => 'لآ',
+  65270 => 'لآ',
+  65271 => 'لأ',
+  65272 => 'لأ',
+  65273 => 'لإ',
+  65274 => 'لإ',
+  65275 => 'لا',
+  65276 => 'لا',
+  65293 => '-',
+  65294 => '.',
+  65296 => '0',
+  65297 => '1',
+  65298 => '2',
+  65299 => '3',
+  65300 => '4',
+  65301 => '5',
+  65302 => '6',
+  65303 => '7',
+  65304 => '8',
+  65305 => '9',
+  65313 => 'a',
+  65314 => 'b',
+  65315 => 'c',
+  65316 => 'd',
+  65317 => 'e',
+  65318 => 'f',
+  65319 => 'g',
+  65320 => 'h',
+  65321 => 'i',
+  65322 => 'j',
+  65323 => 'k',
+  65324 => 'l',
+  65325 => 'm',
+  65326 => 'n',
+  65327 => 'o',
+  65328 => 'p',
+  65329 => 'q',
+  65330 => 'r',
+  65331 => 's',
+  65332 => 't',
+  65333 => 'u',
+  65334 => 'v',
+  65335 => 'w',
+  65336 => 'x',
+  65337 => 'y',
+  65338 => 'z',
+  65345 => 'a',
+  65346 => 'b',
+  65347 => 'c',
+  65348 => 'd',
+  65349 => 'e',
+  65350 => 'f',
+  65351 => 'g',
+  65352 => 'h',
+  65353 => 'i',
+  65354 => 'j',
+  65355 => 'k',
+  65356 => 'l',
+  65357 => 'm',
+  65358 => 'n',
+  65359 => 'o',
+  65360 => 'p',
+  65361 => 'q',
+  65362 => 'r',
+  65363 => 's',
+  65364 => 't',
+  65365 => 'u',
+  65366 => 'v',
+  65367 => 'w',
+  65368 => 'x',
+  65369 => 'y',
+  65370 => 'z',
+  65375 => '⦅',
+  65376 => '⦆',
+  65377 => '.',
+  65378 => '「',
+  65379 => '」',
+  65380 => '、',
+  65381 => '・',
+  65382 => 'ヲ',
+  65383 => 'ァ',
+  65384 => 'ィ',
+  65385 => 'ゥ',
+  65386 => 'ェ',
+  65387 => 'ォ',
+  65388 => 'ャ',
+  65389 => 'ュ',
+  65390 => 'ョ',
+  65391 => 'ッ',
+  65392 => 'ー',
+  65393 => 'ア',
+  65394 => 'イ',
+  65395 => 'ウ',
+  65396 => 'エ',
+  65397 => 'オ',
+  65398 => 'カ',
+  65399 => 'キ',
+  65400 => 'ク',
+  65401 => 'ケ',
+  65402 => 'コ',
+  65403 => 'サ',
+  65404 => 'シ',
+  65405 => 'ス',
+  65406 => 'セ',
+  65407 => 'ソ',
+  65408 => 'タ',
+  65409 => 'チ',
+  65410 => 'ツ',
+  65411 => 'テ',
+  65412 => 'ト',
+  65413 => 'ナ',
+  65414 => 'ニ',
+  65415 => 'ヌ',
+  65416 => 'ネ',
+  65417 => 'ノ',
+  65418 => 'ハ',
+  65419 => 'ヒ',
+  65420 => 'フ',
+  65421 => 'ヘ',
+  65422 => 'ホ',
+  65423 => 'マ',
+  65424 => 'ミ',
+  65425 => 'ム',
+  65426 => 'メ',
+  65427 => 'モ',
+  65428 => 'ヤ',
+  65429 => 'ユ',
+  65430 => 'ヨ',
+  65431 => 'ラ',
+  65432 => 'リ',
+  65433 => 'ル',
+  65434 => 'レ',
+  65435 => 'ロ',
+  65436 => 'ワ',
+  65437 => 'ン',
+  65438 => '゙',
+  65439 => '゚',
+  65441 => 'ᄀ',
+  65442 => 'ᄁ',
+  65443 => 'ᆪ',
+  65444 => 'ᄂ',
+  65445 => 'ᆬ',
+  65446 => 'ᆭ',
+  65447 => 'ᄃ',
+  65448 => 'ᄄ',
+  65449 => 'ᄅ',
+  65450 => 'ᆰ',
+  65451 => 'ᆱ',
+  65452 => 'ᆲ',
+  65453 => 'ᆳ',
+  65454 => 'ᆴ',
+  65455 => 'ᆵ',
+  65456 => 'ᄚ',
+  65457 => 'ᄆ',
+  65458 => 'ᄇ',
+  65459 => 'ᄈ',
+  65460 => 'ᄡ',
+  65461 => 'ᄉ',
+  65462 => 'ᄊ',
+  65463 => 'ᄋ',
+  65464 => 'ᄌ',
+  65465 => 'ᄍ',
+  65466 => 'ᄎ',
+  65467 => 'ᄏ',
+  65468 => 'ᄐ',
+  65469 => 'ᄑ',
+  65470 => 'ᄒ',
+  65474 => 'ᅡ',
+  65475 => 'ᅢ',
+  65476 => 'ᅣ',
+  65477 => 'ᅤ',
+  65478 => 'ᅥ',
+  65479 => 'ᅦ',
+  65482 => 'ᅧ',
+  65483 => 'ᅨ',
+  65484 => 'ᅩ',
+  65485 => 'ᅪ',
+  65486 => 'ᅫ',
+  65487 => 'ᅬ',
+  65490 => 'ᅭ',
+  65491 => 'ᅮ',
+  65492 => 'ᅯ',
+  65493 => 'ᅰ',
+  65494 => 'ᅱ',
+  65495 => 'ᅲ',
+  65498 => 'ᅳ',
+  65499 => 'ᅴ',
+  65500 => 'ᅵ',
+  65504 => '¢',
+  65505 => '£',
+  65506 => '¬',
+  65508 => '¦',
+  65509 => '¥',
+  65510 => '₩',
+  65512 => '│',
+  65513 => '←',
+  65514 => '↑',
+  65515 => '→',
+  65516 => '↓',
+  65517 => '■',
+  65518 => '○',
+  66560 => '𐐨',
+  66561 => '𐐩',
+  66562 => '𐐪',
+  66563 => '𐐫',
+  66564 => '𐐬',
+  66565 => '𐐭',
+  66566 => '𐐮',
+  66567 => '𐐯',
+  66568 => '𐐰',
+  66569 => '𐐱',
+  66570 => '𐐲',
+  66571 => '𐐳',
+  66572 => '𐐴',
+  66573 => '𐐵',
+  66574 => '𐐶',
+  66575 => '𐐷',
+  66576 => '𐐸',
+  66577 => '𐐹',
+  66578 => '𐐺',
+  66579 => '𐐻',
+  66580 => '𐐼',
+  66581 => '𐐽',
+  66582 => '𐐾',
+  66583 => '𐐿',
+  66584 => '𐑀',
+  66585 => '𐑁',
+  66586 => '𐑂',
+  66587 => '𐑃',
+  66588 => '𐑄',
+  66589 => '𐑅',
+  66590 => '𐑆',
+  66591 => '𐑇',
+  66592 => '𐑈',
+  66593 => '𐑉',
+  66594 => '𐑊',
+  66595 => '𐑋',
+  66596 => '𐑌',
+  66597 => '𐑍',
+  66598 => '𐑎',
+  66599 => '𐑏',
+  66736 => '𐓘',
+  66737 => '𐓙',
+  66738 => '𐓚',
+  66739 => '𐓛',
+  66740 => '𐓜',
+  66741 => '𐓝',
+  66742 => '𐓞',
+  66743 => '𐓟',
+  66744 => '𐓠',
+  66745 => '𐓡',
+  66746 => '𐓢',
+  66747 => '𐓣',
+  66748 => '𐓤',
+  66749 => '𐓥',
+  66750 => '𐓦',
+  66751 => '𐓧',
+  66752 => '𐓨',
+  66753 => '𐓩',
+  66754 => '𐓪',
+  66755 => '𐓫',
+  66756 => '𐓬',
+  66757 => '𐓭',
+  66758 => '𐓮',
+  66759 => '𐓯',
+  66760 => '𐓰',
+  66761 => '𐓱',
+  66762 => '𐓲',
+  66763 => '𐓳',
+  66764 => '𐓴',
+  66765 => '𐓵',
+  66766 => '𐓶',
+  66767 => '𐓷',
+  66768 => '𐓸',
+  66769 => '𐓹',
+  66770 => '𐓺',
+  66771 => '𐓻',
+  68736 => '𐳀',
+  68737 => '𐳁',
+  68738 => '𐳂',
+  68739 => '𐳃',
+  68740 => '𐳄',
+  68741 => '𐳅',
+  68742 => '𐳆',
+  68743 => '𐳇',
+  68744 => '𐳈',
+  68745 => '𐳉',
+  68746 => '𐳊',
+  68747 => '𐳋',
+  68748 => '𐳌',
+  68749 => '𐳍',
+  68750 => '𐳎',
+  68751 => '𐳏',
+  68752 => '𐳐',
+  68753 => '𐳑',
+  68754 => '𐳒',
+  68755 => '𐳓',
+  68756 => '𐳔',
+  68757 => '𐳕',
+  68758 => '𐳖',
+  68759 => '𐳗',
+  68760 => '𐳘',
+  68761 => '𐳙',
+  68762 => '𐳚',
+  68763 => '𐳛',
+  68764 => '𐳜',
+  68765 => '𐳝',
+  68766 => '𐳞',
+  68767 => '𐳟',
+  68768 => '𐳠',
+  68769 => '𐳡',
+  68770 => '𐳢',
+  68771 => '𐳣',
+  68772 => '𐳤',
+  68773 => '𐳥',
+  68774 => '𐳦',
+  68775 => '𐳧',
+  68776 => '𐳨',
+  68777 => '𐳩',
+  68778 => '𐳪',
+  68779 => '𐳫',
+  68780 => '𐳬',
+  68781 => '𐳭',
+  68782 => '𐳮',
+  68783 => '𐳯',
+  68784 => '𐳰',
+  68785 => '𐳱',
+  68786 => '𐳲',
+  71840 => '𑣀',
+  71841 => '𑣁',
+  71842 => '𑣂',
+  71843 => '𑣃',
+  71844 => '𑣄',
+  71845 => '𑣅',
+  71846 => '𑣆',
+  71847 => '𑣇',
+  71848 => '𑣈',
+  71849 => '𑣉',
+  71850 => '𑣊',
+  71851 => '𑣋',
+  71852 => '𑣌',
+  71853 => '𑣍',
+  71854 => '𑣎',
+  71855 => '𑣏',
+  71856 => '𑣐',
+  71857 => '𑣑',
+  71858 => '𑣒',
+  71859 => '𑣓',
+  71860 => '𑣔',
+  71861 => '𑣕',
+  71862 => '𑣖',
+  71863 => '𑣗',
+  71864 => '𑣘',
+  71865 => '𑣙',
+  71866 => '𑣚',
+  71867 => '𑣛',
+  71868 => '𑣜',
+  71869 => '𑣝',
+  71870 => '𑣞',
+  71871 => '𑣟',
+  93760 => '𖹠',
+  93761 => '𖹡',
+  93762 => '𖹢',
+  93763 => '𖹣',
+  93764 => '𖹤',
+  93765 => '𖹥',
+  93766 => '𖹦',
+  93767 => '𖹧',
+  93768 => '𖹨',
+  93769 => '𖹩',
+  93770 => '𖹪',
+  93771 => '𖹫',
+  93772 => '𖹬',
+  93773 => '𖹭',
+  93774 => '𖹮',
+  93775 => '𖹯',
+  93776 => '𖹰',
+  93777 => '𖹱',
+  93778 => '𖹲',
+  93779 => '𖹳',
+  93780 => '𖹴',
+  93781 => '𖹵',
+  93782 => '𖹶',
+  93783 => '𖹷',
+  93784 => '𖹸',
+  93785 => '𖹹',
+  93786 => '𖹺',
+  93787 => '𖹻',
+  93788 => '𖹼',
+  93789 => '𖹽',
+  93790 => '𖹾',
+  93791 => '𖹿',
+  119134 => '𝅗𝅥',
+  119135 => '𝅘𝅥',
+  119136 => '𝅘𝅥𝅮',
+  119137 => '𝅘𝅥𝅯',
+  119138 => '𝅘𝅥𝅰',
+  119139 => '𝅘𝅥𝅱',
+  119140 => '𝅘𝅥𝅲',
+  119227 => '𝆹𝅥',
+  119228 => '𝆺𝅥',
+  119229 => '𝆹𝅥𝅮',
+  119230 => '𝆺𝅥𝅮',
+  119231 => '𝆹𝅥𝅯',
+  119232 => '𝆺𝅥𝅯',
+  119808 => 'a',
+  119809 => 'b',
+  119810 => 'c',
+  119811 => 'd',
+  119812 => 'e',
+  119813 => 'f',
+  119814 => 'g',
+  119815 => 'h',
+  119816 => 'i',
+  119817 => 'j',
+  119818 => 'k',
+  119819 => 'l',
+  119820 => 'm',
+  119821 => 'n',
+  119822 => 'o',
+  119823 => 'p',
+  119824 => 'q',
+  119825 => 'r',
+  119826 => 's',
+  119827 => 't',
+  119828 => 'u',
+  119829 => 'v',
+  119830 => 'w',
+  119831 => 'x',
+  119832 => 'y',
+  119833 => 'z',
+  119834 => 'a',
+  119835 => 'b',
+  119836 => 'c',
+  119837 => 'd',
+  119838 => 'e',
+  119839 => 'f',
+  119840 => 'g',
+  119841 => 'h',
+  119842 => 'i',
+  119843 => 'j',
+  119844 => 'k',
+  119845 => 'l',
+  119846 => 'm',
+  119847 => 'n',
+  119848 => 'o',
+  119849 => 'p',
+  119850 => 'q',
+  119851 => 'r',
+  119852 => 's',
+  119853 => 't',
+  119854 => 'u',
+  119855 => 'v',
+  119856 => 'w',
+  119857 => 'x',
+  119858 => 'y',
+  119859 => 'z',
+  119860 => 'a',
+  119861 => 'b',
+  119862 => 'c',
+  119863 => 'd',
+  119864 => 'e',
+  119865 => 'f',
+  119866 => 'g',
+  119867 => 'h',
+  119868 => 'i',
+  119869 => 'j',
+  119870 => 'k',
+  119871 => 'l',
+  119872 => 'm',
+  119873 => 'n',
+  119874 => 'o',
+  119875 => 'p',
+  119876 => 'q',
+  119877 => 'r',
+  119878 => 's',
+  119879 => 't',
+  119880 => 'u',
+  119881 => 'v',
+  119882 => 'w',
+  119883 => 'x',
+  119884 => 'y',
+  119885 => 'z',
+  119886 => 'a',
+  119887 => 'b',
+  119888 => 'c',
+  119889 => 'd',
+  119890 => 'e',
+  119891 => 'f',
+  119892 => 'g',
+  119894 => 'i',
+  119895 => 'j',
+  119896 => 'k',
+  119897 => 'l',
+  119898 => 'm',
+  119899 => 'n',
+  119900 => 'o',
+  119901 => 'p',
+  119902 => 'q',
+  119903 => 'r',
+  119904 => 's',
+  119905 => 't',
+  119906 => 'u',
+  119907 => 'v',
+  119908 => 'w',
+  119909 => 'x',
+  119910 => 'y',
+  119911 => 'z',
+  119912 => 'a',
+  119913 => 'b',
+  119914 => 'c',
+  119915 => 'd',
+  119916 => 'e',
+  119917 => 'f',
+  119918 => 'g',
+  119919 => 'h',
+  119920 => 'i',
+  119921 => 'j',
+  119922 => 'k',
+  119923 => 'l',
+  119924 => 'm',
+  119925 => 'n',
+  119926 => 'o',
+  119927 => 'p',
+  119928 => 'q',
+  119929 => 'r',
+  119930 => 's',
+  119931 => 't',
+  119932 => 'u',
+  119933 => 'v',
+  119934 => 'w',
+  119935 => 'x',
+  119936 => 'y',
+  119937 => 'z',
+  119938 => 'a',
+  119939 => 'b',
+  119940 => 'c',
+  119941 => 'd',
+  119942 => 'e',
+  119943 => 'f',
+  119944 => 'g',
+  119945 => 'h',
+  119946 => 'i',
+  119947 => 'j',
+  119948 => 'k',
+  119949 => 'l',
+  119950 => 'm',
+  119951 => 'n',
+  119952 => 'o',
+  119953 => 'p',
+  119954 => 'q',
+  119955 => 'r',
+  119956 => 's',
+  119957 => 't',
+  119958 => 'u',
+  119959 => 'v',
+  119960 => 'w',
+  119961 => 'x',
+  119962 => 'y',
+  119963 => 'z',
+  119964 => 'a',
+  119966 => 'c',
+  119967 => 'd',
+  119970 => 'g',
+  119973 => 'j',
+  119974 => 'k',
+  119977 => 'n',
+  119978 => 'o',
+  119979 => 'p',
+  119980 => 'q',
+  119982 => 's',
+  119983 => 't',
+  119984 => 'u',
+  119985 => 'v',
+  119986 => 'w',
+  119987 => 'x',
+  119988 => 'y',
+  119989 => 'z',
+  119990 => 'a',
+  119991 => 'b',
+  119992 => 'c',
+  119993 => 'd',
+  119995 => 'f',
+  119997 => 'h',
+  119998 => 'i',
+  119999 => 'j',
+  120000 => 'k',
+  120001 => 'l',
+  120002 => 'm',
+  120003 => 'n',
+  120005 => 'p',
+  120006 => 'q',
+  120007 => 'r',
+  120008 => 's',
+  120009 => 't',
+  120010 => 'u',
+  120011 => 'v',
+  120012 => 'w',
+  120013 => 'x',
+  120014 => 'y',
+  120015 => 'z',
+  120016 => 'a',
+  120017 => 'b',
+  120018 => 'c',
+  120019 => 'd',
+  120020 => 'e',
+  120021 => 'f',
+  120022 => 'g',
+  120023 => 'h',
+  120024 => 'i',
+  120025 => 'j',
+  120026 => 'k',
+  120027 => 'l',
+  120028 => 'm',
+  120029 => 'n',
+  120030 => 'o',
+  120031 => 'p',
+  120032 => 'q',
+  120033 => 'r',
+  120034 => 's',
+  120035 => 't',
+  120036 => 'u',
+  120037 => 'v',
+  120038 => 'w',
+  120039 => 'x',
+  120040 => 'y',
+  120041 => 'z',
+  120042 => 'a',
+  120043 => 'b',
+  120044 => 'c',
+  120045 => 'd',
+  120046 => 'e',
+  120047 => 'f',
+  120048 => 'g',
+  120049 => 'h',
+  120050 => 'i',
+  120051 => 'j',
+  120052 => 'k',
+  120053 => 'l',
+  120054 => 'm',
+  120055 => 'n',
+  120056 => 'o',
+  120057 => 'p',
+  120058 => 'q',
+  120059 => 'r',
+  120060 => 's',
+  120061 => 't',
+  120062 => 'u',
+  120063 => 'v',
+  120064 => 'w',
+  120065 => 'x',
+  120066 => 'y',
+  120067 => 'z',
+  120068 => 'a',
+  120069 => 'b',
+  120071 => 'd',
+  120072 => 'e',
+  120073 => 'f',
+  120074 => 'g',
+  120077 => 'j',
+  120078 => 'k',
+  120079 => 'l',
+  120080 => 'm',
+  120081 => 'n',
+  120082 => 'o',
+  120083 => 'p',
+  120084 => 'q',
+  120086 => 's',
+  120087 => 't',
+  120088 => 'u',
+  120089 => 'v',
+  120090 => 'w',
+  120091 => 'x',
+  120092 => 'y',
+  120094 => 'a',
+  120095 => 'b',
+  120096 => 'c',
+  120097 => 'd',
+  120098 => 'e',
+  120099 => 'f',
+  120100 => 'g',
+  120101 => 'h',
+  120102 => 'i',
+  120103 => 'j',
+  120104 => 'k',
+  120105 => 'l',
+  120106 => 'm',
+  120107 => 'n',
+  120108 => 'o',
+  120109 => 'p',
+  120110 => 'q',
+  120111 => 'r',
+  120112 => 's',
+  120113 => 't',
+  120114 => 'u',
+  120115 => 'v',
+  120116 => 'w',
+  120117 => 'x',
+  120118 => 'y',
+  120119 => 'z',
+  120120 => 'a',
+  120121 => 'b',
+  120123 => 'd',
+  120124 => 'e',
+  120125 => 'f',
+  120126 => 'g',
+  120128 => 'i',
+  120129 => 'j',
+  120130 => 'k',
+  120131 => 'l',
+  120132 => 'm',
+  120134 => 'o',
+  120138 => 's',
+  120139 => 't',
+  120140 => 'u',
+  120141 => 'v',
+  120142 => 'w',
+  120143 => 'x',
+  120144 => 'y',
+  120146 => 'a',
+  120147 => 'b',
+  120148 => 'c',
+  120149 => 'd',
+  120150 => 'e',
+  120151 => 'f',
+  120152 => 'g',
+  120153 => 'h',
+  120154 => 'i',
+  120155 => 'j',
+  120156 => 'k',
+  120157 => 'l',
+  120158 => 'm',
+  120159 => 'n',
+  120160 => 'o',
+  120161 => 'p',
+  120162 => 'q',
+  120163 => 'r',
+  120164 => 's',
+  120165 => 't',
+  120166 => 'u',
+  120167 => 'v',
+  120168 => 'w',
+  120169 => 'x',
+  120170 => 'y',
+  120171 => 'z',
+  120172 => 'a',
+  120173 => 'b',
+  120174 => 'c',
+  120175 => 'd',
+  120176 => 'e',
+  120177 => 'f',
+  120178 => 'g',
+  120179 => 'h',
+  120180 => 'i',
+  120181 => 'j',
+  120182 => 'k',
+  120183 => 'l',
+  120184 => 'm',
+  120185 => 'n',
+  120186 => 'o',
+  120187 => 'p',
+  120188 => 'q',
+  120189 => 'r',
+  120190 => 's',
+  120191 => 't',
+  120192 => 'u',
+  120193 => 'v',
+  120194 => 'w',
+  120195 => 'x',
+  120196 => 'y',
+  120197 => 'z',
+  120198 => 'a',
+  120199 => 'b',
+  120200 => 'c',
+  120201 => 'd',
+  120202 => 'e',
+  120203 => 'f',
+  120204 => 'g',
+  120205 => 'h',
+  120206 => 'i',
+  120207 => 'j',
+  120208 => 'k',
+  120209 => 'l',
+  120210 => 'm',
+  120211 => 'n',
+  120212 => 'o',
+  120213 => 'p',
+  120214 => 'q',
+  120215 => 'r',
+  120216 => 's',
+  120217 => 't',
+  120218 => 'u',
+  120219 => 'v',
+  120220 => 'w',
+  120221 => 'x',
+  120222 => 'y',
+  120223 => 'z',
+  120224 => 'a',
+  120225 => 'b',
+  120226 => 'c',
+  120227 => 'd',
+  120228 => 'e',
+  120229 => 'f',
+  120230 => 'g',
+  120231 => 'h',
+  120232 => 'i',
+  120233 => 'j',
+  120234 => 'k',
+  120235 => 'l',
+  120236 => 'm',
+  120237 => 'n',
+  120238 => 'o',
+  120239 => 'p',
+  120240 => 'q',
+  120241 => 'r',
+  120242 => 's',
+  120243 => 't',
+  120244 => 'u',
+  120245 => 'v',
+  120246 => 'w',
+  120247 => 'x',
+  120248 => 'y',
+  120249 => 'z',
+  120250 => 'a',
+  120251 => 'b',
+  120252 => 'c',
+  120253 => 'd',
+  120254 => 'e',
+  120255 => 'f',
+  120256 => 'g',
+  120257 => 'h',
+  120258 => 'i',
+  120259 => 'j',
+  120260 => 'k',
+  120261 => 'l',
+  120262 => 'm',
+  120263 => 'n',
+  120264 => 'o',
+  120265 => 'p',
+  120266 => 'q',
+  120267 => 'r',
+  120268 => 's',
+  120269 => 't',
+  120270 => 'u',
+  120271 => 'v',
+  120272 => 'w',
+  120273 => 'x',
+  120274 => 'y',
+  120275 => 'z',
+  120276 => 'a',
+  120277 => 'b',
+  120278 => 'c',
+  120279 => 'd',
+  120280 => 'e',
+  120281 => 'f',
+  120282 => 'g',
+  120283 => 'h',
+  120284 => 'i',
+  120285 => 'j',
+  120286 => 'k',
+  120287 => 'l',
+  120288 => 'm',
+  120289 => 'n',
+  120290 => 'o',
+  120291 => 'p',
+  120292 => 'q',
+  120293 => 'r',
+  120294 => 's',
+  120295 => 't',
+  120296 => 'u',
+  120297 => 'v',
+  120298 => 'w',
+  120299 => 'x',
+  120300 => 'y',
+  120301 => 'z',
+  120302 => 'a',
+  120303 => 'b',
+  120304 => 'c',
+  120305 => 'd',
+  120306 => 'e',
+  120307 => 'f',
+  120308 => 'g',
+  120309 => 'h',
+  120310 => 'i',
+  120311 => 'j',
+  120312 => 'k',
+  120313 => 'l',
+  120314 => 'm',
+  120315 => 'n',
+  120316 => 'o',
+  120317 => 'p',
+  120318 => 'q',
+  120319 => 'r',
+  120320 => 's',
+  120321 => 't',
+  120322 => 'u',
+  120323 => 'v',
+  120324 => 'w',
+  120325 => 'x',
+  120326 => 'y',
+  120327 => 'z',
+  120328 => 'a',
+  120329 => 'b',
+  120330 => 'c',
+  120331 => 'd',
+  120332 => 'e',
+  120333 => 'f',
+  120334 => 'g',
+  120335 => 'h',
+  120336 => 'i',
+  120337 => 'j',
+  120338 => 'k',
+  120339 => 'l',
+  120340 => 'm',
+  120341 => 'n',
+  120342 => 'o',
+  120343 => 'p',
+  120344 => 'q',
+  120345 => 'r',
+  120346 => 's',
+  120347 => 't',
+  120348 => 'u',
+  120349 => 'v',
+  120350 => 'w',
+  120351 => 'x',
+  120352 => 'y',
+  120353 => 'z',
+  120354 => 'a',
+  120355 => 'b',
+  120356 => 'c',
+  120357 => 'd',
+  120358 => 'e',
+  120359 => 'f',
+  120360 => 'g',
+  120361 => 'h',
+  120362 => 'i',
+  120363 => 'j',
+  120364 => 'k',
+  120365 => 'l',
+  120366 => 'm',
+  120367 => 'n',
+  120368 => 'o',
+  120369 => 'p',
+  120370 => 'q',
+  120371 => 'r',
+  120372 => 's',
+  120373 => 't',
+  120374 => 'u',
+  120375 => 'v',
+  120376 => 'w',
+  120377 => 'x',
+  120378 => 'y',
+  120379 => 'z',
+  120380 => 'a',
+  120381 => 'b',
+  120382 => 'c',
+  120383 => 'd',
+  120384 => 'e',
+  120385 => 'f',
+  120386 => 'g',
+  120387 => 'h',
+  120388 => 'i',
+  120389 => 'j',
+  120390 => 'k',
+  120391 => 'l',
+  120392 => 'm',
+  120393 => 'n',
+  120394 => 'o',
+  120395 => 'p',
+  120396 => 'q',
+  120397 => 'r',
+  120398 => 's',
+  120399 => 't',
+  120400 => 'u',
+  120401 => 'v',
+  120402 => 'w',
+  120403 => 'x',
+  120404 => 'y',
+  120405 => 'z',
+  120406 => 'a',
+  120407 => 'b',
+  120408 => 'c',
+  120409 => 'd',
+  120410 => 'e',
+  120411 => 'f',
+  120412 => 'g',
+  120413 => 'h',
+  120414 => 'i',
+  120415 => 'j',
+  120416 => 'k',
+  120417 => 'l',
+  120418 => 'm',
+  120419 => 'n',
+  120420 => 'o',
+  120421 => 'p',
+  120422 => 'q',
+  120423 => 'r',
+  120424 => 's',
+  120425 => 't',
+  120426 => 'u',
+  120427 => 'v',
+  120428 => 'w',
+  120429 => 'x',
+  120430 => 'y',
+  120431 => 'z',
+  120432 => 'a',
+  120433 => 'b',
+  120434 => 'c',
+  120435 => 'd',
+  120436 => 'e',
+  120437 => 'f',
+  120438 => 'g',
+  120439 => 'h',
+  120440 => 'i',
+  120441 => 'j',
+  120442 => 'k',
+  120443 => 'l',
+  120444 => 'm',
+  120445 => 'n',
+  120446 => 'o',
+  120447 => 'p',
+  120448 => 'q',
+  120449 => 'r',
+  120450 => 's',
+  120451 => 't',
+  120452 => 'u',
+  120453 => 'v',
+  120454 => 'w',
+  120455 => 'x',
+  120456 => 'y',
+  120457 => 'z',
+  120458 => 'a',
+  120459 => 'b',
+  120460 => 'c',
+  120461 => 'd',
+  120462 => 'e',
+  120463 => 'f',
+  120464 => 'g',
+  120465 => 'h',
+  120466 => 'i',
+  120467 => 'j',
+  120468 => 'k',
+  120469 => 'l',
+  120470 => 'm',
+  120471 => 'n',
+  120472 => 'o',
+  120473 => 'p',
+  120474 => 'q',
+  120475 => 'r',
+  120476 => 's',
+  120477 => 't',
+  120478 => 'u',
+  120479 => 'v',
+  120480 => 'w',
+  120481 => 'x',
+  120482 => 'y',
+  120483 => 'z',
+  120484 => 'ı',
+  120485 => 'ȷ',
+  120488 => 'α',
+  120489 => 'β',
+  120490 => 'γ',
+  120491 => 'δ',
+  120492 => 'ε',
+  120493 => 'ζ',
+  120494 => 'η',
+  120495 => 'θ',
+  120496 => 'ι',
+  120497 => 'κ',
+  120498 => 'λ',
+  120499 => 'μ',
+  120500 => 'ν',
+  120501 => 'ξ',
+  120502 => 'ο',
+  120503 => 'π',
+  120504 => 'ρ',
+  120505 => 'θ',
+  120506 => 'σ',
+  120507 => 'τ',
+  120508 => 'υ',
+  120509 => 'φ',
+  120510 => 'χ',
+  120511 => 'ψ',
+  120512 => 'ω',
+  120513 => '∇',
+  120514 => 'α',
+  120515 => 'β',
+  120516 => 'γ',
+  120517 => 'δ',
+  120518 => 'ε',
+  120519 => 'ζ',
+  120520 => 'η',
+  120521 => 'θ',
+  120522 => 'ι',
+  120523 => 'κ',
+  120524 => 'λ',
+  120525 => 'μ',
+  120526 => 'ν',
+  120527 => 'ξ',
+  120528 => 'ο',
+  120529 => 'π',
+  120530 => 'ρ',
+  120531 => 'σ',
+  120532 => 'σ',
+  120533 => 'τ',
+  120534 => 'υ',
+  120535 => 'φ',
+  120536 => 'χ',
+  120537 => 'ψ',
+  120538 => 'ω',
+  120539 => '∂',
+  120540 => 'ε',
+  120541 => 'θ',
+  120542 => 'κ',
+  120543 => 'φ',
+  120544 => 'ρ',
+  120545 => 'π',
+  120546 => 'α',
+  120547 => 'β',
+  120548 => 'γ',
+  120549 => 'δ',
+  120550 => 'ε',
+  120551 => 'ζ',
+  120552 => 'η',
+  120553 => 'θ',
+  120554 => 'ι',
+  120555 => 'κ',
+  120556 => 'λ',
+  120557 => 'μ',
+  120558 => 'ν',
+  120559 => 'ξ',
+  120560 => 'ο',
+  120561 => 'π',
+  120562 => 'ρ',
+  120563 => 'θ',
+  120564 => 'σ',
+  120565 => 'τ',
+  120566 => 'υ',
+  120567 => 'φ',
+  120568 => 'χ',
+  120569 => 'ψ',
+  120570 => 'ω',
+  120571 => '∇',
+  120572 => 'α',
+  120573 => 'β',
+  120574 => 'γ',
+  120575 => 'δ',
+  120576 => 'ε',
+  120577 => 'ζ',
+  120578 => 'η',
+  120579 => 'θ',
+  120580 => 'ι',
+  120581 => 'κ',
+  120582 => 'λ',
+  120583 => 'μ',
+  120584 => 'ν',
+  120585 => 'ξ',
+  120586 => 'ο',
+  120587 => 'π',
+  120588 => 'ρ',
+  120589 => 'σ',
+  120590 => 'σ',
+  120591 => 'τ',
+  120592 => 'υ',
+  120593 => 'φ',
+  120594 => 'χ',
+  120595 => 'ψ',
+  120596 => 'ω',
+  120597 => '∂',
+  120598 => 'ε',
+  120599 => 'θ',
+  120600 => 'κ',
+  120601 => 'φ',
+  120602 => 'ρ',
+  120603 => 'π',
+  120604 => 'α',
+  120605 => 'β',
+  120606 => 'γ',
+  120607 => 'δ',
+  120608 => 'ε',
+  120609 => 'ζ',
+  120610 => 'η',
+  120611 => 'θ',
+  120612 => 'ι',
+  120613 => 'κ',
+  120614 => 'λ',
+  120615 => 'μ',
+  120616 => 'ν',
+  120617 => 'ξ',
+  120618 => 'ο',
+  120619 => 'π',
+  120620 => 'ρ',
+  120621 => 'θ',
+  120622 => 'σ',
+  120623 => 'τ',
+  120624 => 'υ',
+  120625 => 'φ',
+  120626 => 'χ',
+  120627 => 'ψ',
+  120628 => 'ω',
+  120629 => '∇',
+  120630 => 'α',
+  120631 => 'β',
+  120632 => 'γ',
+  120633 => 'δ',
+  120634 => 'ε',
+  120635 => 'ζ',
+  120636 => 'η',
+  120637 => 'θ',
+  120638 => 'ι',
+  120639 => 'κ',
+  120640 => 'λ',
+  120641 => 'μ',
+  120642 => 'ν',
+  120643 => 'ξ',
+  120644 => 'ο',
+  120645 => 'π',
+  120646 => 'ρ',
+  120647 => 'σ',
+  120648 => 'σ',
+  120649 => 'τ',
+  120650 => 'υ',
+  120651 => 'φ',
+  120652 => 'χ',
+  120653 => 'ψ',
+  120654 => 'ω',
+  120655 => '∂',
+  120656 => 'ε',
+  120657 => 'θ',
+  120658 => 'κ',
+  120659 => 'φ',
+  120660 => 'ρ',
+  120661 => 'π',
+  120662 => 'α',
+  120663 => 'β',
+  120664 => 'γ',
+  120665 => 'δ',
+  120666 => 'ε',
+  120667 => 'ζ',
+  120668 => 'η',
+  120669 => 'θ',
+  120670 => 'ι',
+  120671 => 'κ',
+  120672 => 'λ',
+  120673 => 'μ',
+  120674 => 'ν',
+  120675 => 'ξ',
+  120676 => 'ο',
+  120677 => 'π',
+  120678 => 'ρ',
+  120679 => 'θ',
+  120680 => 'σ',
+  120681 => 'τ',
+  120682 => 'υ',
+  120683 => 'φ',
+  120684 => 'χ',
+  120685 => 'ψ',
+  120686 => 'ω',
+  120687 => '∇',
+  120688 => 'α',
+  120689 => 'β',
+  120690 => 'γ',
+  120691 => 'δ',
+  120692 => 'ε',
+  120693 => 'ζ',
+  120694 => 'η',
+  120695 => 'θ',
+  120696 => 'ι',
+  120697 => 'κ',
+  120698 => 'λ',
+  120699 => 'μ',
+  120700 => 'ν',
+  120701 => 'ξ',
+  120702 => 'ο',
+  120703 => 'π',
+  120704 => 'ρ',
+  120705 => 'σ',
+  120706 => 'σ',
+  120707 => 'τ',
+  120708 => 'υ',
+  120709 => 'φ',
+  120710 => 'χ',
+  120711 => 'ψ',
+  120712 => 'ω',
+  120713 => '∂',
+  120714 => 'ε',
+  120715 => 'θ',
+  120716 => 'κ',
+  120717 => 'φ',
+  120718 => 'ρ',
+  120719 => 'π',
+  120720 => 'α',
+  120721 => 'β',
+  120722 => 'γ',
+  120723 => 'δ',
+  120724 => 'ε',
+  120725 => 'ζ',
+  120726 => 'η',
+  120727 => 'θ',
+  120728 => 'ι',
+  120729 => 'κ',
+  120730 => 'λ',
+  120731 => 'μ',
+  120732 => 'ν',
+  120733 => 'ξ',
+  120734 => 'ο',
+  120735 => 'π',
+  120736 => 'ρ',
+  120737 => 'θ',
+  120738 => 'σ',
+  120739 => 'τ',
+  120740 => 'υ',
+  120741 => 'φ',
+  120742 => 'χ',
+  120743 => 'ψ',
+  120744 => 'ω',
+  120745 => '∇',
+  120746 => 'α',
+  120747 => 'β',
+  120748 => 'γ',
+  120749 => 'δ',
+  120750 => 'ε',
+  120751 => 'ζ',
+  120752 => 'η',
+  120753 => 'θ',
+  120754 => 'ι',
+  120755 => 'κ',
+  120756 => 'λ',
+  120757 => 'μ',
+  120758 => 'ν',
+  120759 => 'ξ',
+  120760 => 'ο',
+  120761 => 'π',
+  120762 => 'ρ',
+  120763 => 'σ',
+  120764 => 'σ',
+  120765 => 'τ',
+  120766 => 'υ',
+  120767 => 'φ',
+  120768 => 'χ',
+  120769 => 'ψ',
+  120770 => 'ω',
+  120771 => '∂',
+  120772 => 'ε',
+  120773 => 'θ',
+  120774 => 'κ',
+  120775 => 'φ',
+  120776 => 'ρ',
+  120777 => 'π',
+  120778 => 'ϝ',
+  120779 => 'ϝ',
+  120782 => '0',
+  120783 => '1',
+  120784 => '2',
+  120785 => '3',
+  120786 => '4',
+  120787 => '5',
+  120788 => '6',
+  120789 => '7',
+  120790 => '8',
+  120791 => '9',
+  120792 => '0',
+  120793 => '1',
+  120794 => '2',
+  120795 => '3',
+  120796 => '4',
+  120797 => '5',
+  120798 => '6',
+  120799 => '7',
+  120800 => '8',
+  120801 => '9',
+  120802 => '0',
+  120803 => '1',
+  120804 => '2',
+  120805 => '3',
+  120806 => '4',
+  120807 => '5',
+  120808 => '6',
+  120809 => '7',
+  120810 => '8',
+  120811 => '9',
+  120812 => '0',
+  120813 => '1',
+  120814 => '2',
+  120815 => '3',
+  120816 => '4',
+  120817 => '5',
+  120818 => '6',
+  120819 => '7',
+  120820 => '8',
+  120821 => '9',
+  120822 => '0',
+  120823 => '1',
+  120824 => '2',
+  120825 => '3',
+  120826 => '4',
+  120827 => '5',
+  120828 => '6',
+  120829 => '7',
+  120830 => '8',
+  120831 => '9',
+  125184 => '𞤢',
+  125185 => '𞤣',
+  125186 => '𞤤',
+  125187 => '𞤥',
+  125188 => '𞤦',
+  125189 => '𞤧',
+  125190 => '𞤨',
+  125191 => '𞤩',
+  125192 => '𞤪',
+  125193 => '𞤫',
+  125194 => '𞤬',
+  125195 => '𞤭',
+  125196 => '𞤮',
+  125197 => '𞤯',
+  125198 => '𞤰',
+  125199 => '𞤱',
+  125200 => '𞤲',
+  125201 => '𞤳',
+  125202 => '𞤴',
+  125203 => '𞤵',
+  125204 => '𞤶',
+  125205 => '𞤷',
+  125206 => '𞤸',
+  125207 => '𞤹',
+  125208 => '𞤺',
+  125209 => '𞤻',
+  125210 => '𞤼',
+  125211 => '𞤽',
+  125212 => '𞤾',
+  125213 => '𞤿',
+  125214 => '𞥀',
+  125215 => '𞥁',
+  125216 => '𞥂',
+  125217 => '𞥃',
+  126464 => 'ا',
+  126465 => 'ب',
+  126466 => 'ج',
+  126467 => 'د',
+  126469 => 'و',
+  126470 => 'ز',
+  126471 => 'ح',
+  126472 => 'ط',
+  126473 => 'ي',
+  126474 => 'ك',
+  126475 => 'ل',
+  126476 => 'م',
+  126477 => 'ن',
+  126478 => 'س',
+  126479 => 'ع',
+  126480 => 'ف',
+  126481 => 'ص',
+  126482 => 'ق',
+  126483 => 'ر',
+  126484 => 'ش',
+  126485 => 'ت',
+  126486 => 'ث',
+  126487 => 'خ',
+  126488 => 'ذ',
+  126489 => 'ض',
+  126490 => 'ظ',
+  126491 => 'غ',
+  126492 => 'ٮ',
+  126493 => 'ں',
+  126494 => 'ڡ',
+  126495 => 'ٯ',
+  126497 => 'ب',
+  126498 => 'ج',
+  126500 => 'ه',
+  126503 => 'ح',
+  126505 => 'ي',
+  126506 => 'ك',
+  126507 => 'ل',
+  126508 => 'م',
+  126509 => 'ن',
+  126510 => 'س',
+  126511 => 'ع',
+  126512 => 'ف',
+  126513 => 'ص',
+  126514 => 'ق',
+  126516 => 'ش',
+  126517 => 'ت',
+  126518 => 'ث',
+  126519 => 'خ',
+  126521 => 'ض',
+  126523 => 'غ',
+  126530 => 'ج',
+  126535 => 'ح',
+  126537 => 'ي',
+  126539 => 'ل',
+  126541 => 'ن',
+  126542 => 'س',
+  126543 => 'ع',
+  126545 => 'ص',
+  126546 => 'ق',
+  126548 => 'ش',
+  126551 => 'خ',
+  126553 => 'ض',
+  126555 => 'غ',
+  126557 => 'ں',
+  126559 => 'ٯ',
+  126561 => 'ب',
+  126562 => 'ج',
+  126564 => 'ه',
+  126567 => 'ح',
+  126568 => 'ط',
+  126569 => 'ي',
+  126570 => 'ك',
+  126572 => 'م',
+  126573 => 'ن',
+  126574 => 'س',
+  126575 => 'ع',
+  126576 => 'ف',
+  126577 => 'ص',
+  126578 => 'ق',
+  126580 => 'ش',
+  126581 => 'ت',
+  126582 => 'ث',
+  126583 => 'خ',
+  126585 => 'ض',
+  126586 => 'ظ',
+  126587 => 'غ',
+  126588 => 'ٮ',
+  126590 => 'ڡ',
+  126592 => 'ا',
+  126593 => 'ب',
+  126594 => 'ج',
+  126595 => 'د',
+  126596 => 'ه',
+  126597 => 'و',
+  126598 => 'ز',
+  126599 => 'ح',
+  126600 => 'ط',
+  126601 => 'ي',
+  126603 => 'ل',
+  126604 => 'م',
+  126605 => 'ن',
+  126606 => 'س',
+  126607 => 'ع',
+  126608 => 'ف',
+  126609 => 'ص',
+  126610 => 'ق',
+  126611 => 'ر',
+  126612 => 'ش',
+  126613 => 'ت',
+  126614 => 'ث',
+  126615 => 'خ',
+  126616 => 'ذ',
+  126617 => 'ض',
+  126618 => 'ظ',
+  126619 => 'غ',
+  126625 => 'ب',
+  126626 => 'ج',
+  126627 => 'د',
+  126629 => 'و',
+  126630 => 'ز',
+  126631 => 'ح',
+  126632 => 'ط',
+  126633 => 'ي',
+  126635 => 'ل',
+  126636 => 'م',
+  126637 => 'ن',
+  126638 => 'س',
+  126639 => 'ع',
+  126640 => 'ف',
+  126641 => 'ص',
+  126642 => 'ق',
+  126643 => 'ر',
+  126644 => 'ش',
+  126645 => 'ت',
+  126646 => 'ث',
+  126647 => 'خ',
+  126648 => 'ذ',
+  126649 => 'ض',
+  126650 => 'ظ',
+  126651 => 'غ',
+  127274 => '〔s〕',
+  127275 => 'c',
+  127276 => 'r',
+  127277 => 'cd',
+  127278 => 'wz',
+  127280 => 'a',
+  127281 => 'b',
+  127282 => 'c',
+  127283 => 'd',
+  127284 => 'e',
+  127285 => 'f',
+  127286 => 'g',
+  127287 => 'h',
+  127288 => 'i',
+  127289 => 'j',
+  127290 => 'k',
+  127291 => 'l',
+  127292 => 'm',
+  127293 => 'n',
+  127294 => 'o',
+  127295 => 'p',
+  127296 => 'q',
+  127297 => 'r',
+  127298 => 's',
+  127299 => 't',
+  127300 => 'u',
+  127301 => 'v',
+  127302 => 'w',
+  127303 => 'x',
+  127304 => 'y',
+  127305 => 'z',
+  127306 => 'hv',
+  127307 => 'mv',
+  127308 => 'sd',
+  127309 => 'ss',
+  127310 => 'ppv',
+  127311 => 'wc',
+  127338 => 'mc',
+  127339 => 'md',
+  127340 => 'mr',
+  127376 => 'dj',
+  127488 => 'ほか',
+  127489 => 'ココ',
+  127490 => 'サ',
+  127504 => '手',
+  127505 => '字',
+  127506 => '双',
+  127507 => 'デ',
+  127508 => '二',
+  127509 => '多',
+  127510 => '解',
+  127511 => '天',
+  127512 => '交',
+  127513 => '映',
+  127514 => '無',
+  127515 => '料',
+  127516 => '前',
+  127517 => '後',
+  127518 => '再',
+  127519 => '新',
+  127520 => '初',
+  127521 => '終',
+  127522 => '生',
+  127523 => '販',
+  127524 => '声',
+  127525 => '吹',
+  127526 => '演',
+  127527 => '投',
+  127528 => '捕',
+  127529 => '一',
+  127530 => '三',
+  127531 => '遊',
+  127532 => '左',
+  127533 => '中',
+  127534 => '右',
+  127535 => '指',
+  127536 => '走',
+  127537 => '打',
+  127538 => '禁',
+  127539 => '空',
+  127540 => '合',
+  127541 => '満',
+  127542 => '有',
+  127543 => '月',
+  127544 => '申',
+  127545 => '割',
+  127546 => '営',
+  127547 => '配',
+  127552 => '〔本〕',
+  127553 => '〔三〕',
+  127554 => '〔二〕',
+  127555 => '〔安〕',
+  127556 => '〔点〕',
+  127557 => '〔打〕',
+  127558 => '〔盗〕',
+  127559 => '〔勝〕',
+  127560 => '〔敗〕',
+  127568 => '得',
+  127569 => '可',
+  130032 => '0',
+  130033 => '1',
+  130034 => '2',
+  130035 => '3',
+  130036 => '4',
+  130037 => '5',
+  130038 => '6',
+  130039 => '7',
+  130040 => '8',
+  130041 => '9',
+  194560 => '丽',
+  194561 => '丸',
+  194562 => '乁',
+  194563 => '𠄢',
+  194564 => '你',
+  194565 => '侮',
+  194566 => '侻',
+  194567 => '倂',
+  194568 => '偺',
+  194569 => '備',
+  194570 => '僧',
+  194571 => '像',
+  194572 => '㒞',
+  194573 => '𠘺',
+  194574 => '免',
+  194575 => '兔',
+  194576 => '兤',
+  194577 => '具',
+  194578 => '𠔜',
+  194579 => '㒹',
+  194580 => '內',
+  194581 => '再',
+  194582 => '𠕋',
+  194583 => '冗',
+  194584 => '冤',
+  194585 => '仌',
+  194586 => '冬',
+  194587 => '况',
+  194588 => '𩇟',
+  194589 => '凵',
+  194590 => '刃',
+  194591 => '㓟',
+  194592 => '刻',
+  194593 => '剆',
+  194594 => '割',
+  194595 => '剷',
+  194596 => '㔕',
+  194597 => '勇',
+  194598 => '勉',
+  194599 => '勤',
+  194600 => '勺',
+  194601 => '包',
+  194602 => '匆',
+  194603 => '北',
+  194604 => '卉',
+  194605 => '卑',
+  194606 => '博',
+  194607 => '即',
+  194608 => '卽',
+  194609 => '卿',
+  194610 => '卿',
+  194611 => '卿',
+  194612 => '𠨬',
+  194613 => '灰',
+  194614 => '及',
+  194615 => '叟',
+  194616 => '𠭣',
+  194617 => '叫',
+  194618 => '叱',
+  194619 => '吆',
+  194620 => '咞',
+  194621 => '吸',
+  194622 => '呈',
+  194623 => '周',
+  194624 => '咢',
+  194625 => '哶',
+  194626 => '唐',
+  194627 => '啓',
+  194628 => '啣',
+  194629 => '善',
+  194630 => '善',
+  194631 => '喙',
+  194632 => '喫',
+  194633 => '喳',
+  194634 => '嗂',
+  194635 => '圖',
+  194636 => '嘆',
+  194637 => '圗',
+  194638 => '噑',
+  194639 => '噴',
+  194640 => '切',
+  194641 => '壮',
+  194642 => '城',
+  194643 => '埴',
+  194644 => '堍',
+  194645 => '型',
+  194646 => '堲',
+  194647 => '報',
+  194648 => '墬',
+  194649 => '𡓤',
+  194650 => '売',
+  194651 => '壷',
+  194652 => '夆',
+  194653 => '多',
+  194654 => '夢',
+  194655 => '奢',
+  194656 => '𡚨',
+  194657 => '𡛪',
+  194658 => '姬',
+  194659 => '娛',
+  194660 => '娧',
+  194661 => '姘',
+  194662 => '婦',
+  194663 => '㛮',
+  194665 => '嬈',
+  194666 => '嬾',
+  194667 => '嬾',
+  194668 => '𡧈',
+  194669 => '寃',
+  194670 => '寘',
+  194671 => '寧',
+  194672 => '寳',
+  194673 => '𡬘',
+  194674 => '寿',
+  194675 => '将',
+  194677 => '尢',
+  194678 => '㞁',
+  194679 => '屠',
+  194680 => '屮',
+  194681 => '峀',
+  194682 => '岍',
+  194683 => '𡷤',
+  194684 => '嵃',
+  194685 => '𡷦',
+  194686 => '嵮',
+  194687 => '嵫',
+  194688 => '嵼',
+  194689 => '巡',
+  194690 => '巢',
+  194691 => '㠯',
+  194692 => '巽',
+  194693 => '帨',
+  194694 => '帽',
+  194695 => '幩',
+  194696 => '㡢',
+  194697 => '𢆃',
+  194698 => '㡼',
+  194699 => '庰',
+  194700 => '庳',
+  194701 => '庶',
+  194702 => '廊',
+  194703 => '𪎒',
+  194704 => '廾',
+  194705 => '𢌱',
+  194706 => '𢌱',
+  194707 => '舁',
+  194708 => '弢',
+  194709 => '弢',
+  194710 => '㣇',
+  194711 => '𣊸',
+  194712 => '𦇚',
+  194713 => '形',
+  194714 => '彫',
+  194715 => '㣣',
+  194716 => '徚',
+  194717 => '忍',
+  194718 => '志',
+  194719 => '忹',
+  194720 => '悁',
+  194721 => '㤺',
+  194722 => '㤜',
+  194723 => '悔',
+  194724 => '𢛔',
+  194725 => '惇',
+  194726 => '慈',
+  194727 => '慌',
+  194728 => '慎',
+  194729 => '慌',
+  194730 => '慺',
+  194731 => '憎',
+  194732 => '憲',
+  194733 => '憤',
+  194734 => '憯',
+  194735 => '懞',
+  194736 => '懲',
+  194737 => '懶',
+  194738 => '成',
+  194739 => '戛',
+  194740 => '扝',
+  194741 => '抱',
+  194742 => '拔',
+  194743 => '捐',
+  194744 => '𢬌',
+  194745 => '挽',
+  194746 => '拼',
+  194747 => '捨',
+  194748 => '掃',
+  194749 => '揤',
+  194750 => '𢯱',
+  194751 => '搢',
+  194752 => '揅',
+  194753 => '掩',
+  194754 => '㨮',
+  194755 => '摩',
+  194756 => '摾',
+  194757 => '撝',
+  194758 => '摷',
+  194759 => '㩬',
+  194760 => '敏',
+  194761 => '敬',
+  194762 => '𣀊',
+  194763 => '旣',
+  194764 => '書',
+  194765 => '晉',
+  194766 => '㬙',
+  194767 => '暑',
+  194768 => '㬈',
+  194769 => '㫤',
+  194770 => '冒',
+  194771 => '冕',
+  194772 => '最',
+  194773 => '暜',
+  194774 => '肭',
+  194775 => '䏙',
+  194776 => '朗',
+  194777 => '望',
+  194778 => '朡',
+  194779 => '杞',
+  194780 => '杓',
+  194781 => '𣏃',
+  194782 => '㭉',
+  194783 => '柺',
+  194784 => '枅',
+  194785 => '桒',
+  194786 => '梅',
+  194787 => '𣑭',
+  194788 => '梎',
+  194789 => '栟',
+  194790 => '椔',
+  194791 => '㮝',
+  194792 => '楂',
+  194793 => '榣',
+  194794 => '槪',
+  194795 => '檨',
+  194796 => '𣚣',
+  194797 => '櫛',
+  194798 => '㰘',
+  194799 => '次',
+  194800 => '𣢧',
+  194801 => '歔',
+  194802 => '㱎',
+  194803 => '歲',
+  194804 => '殟',
+  194805 => '殺',
+  194806 => '殻',
+  194807 => '𣪍',
+  194808 => '𡴋',
+  194809 => '𣫺',
+  194810 => '汎',
+  194811 => '𣲼',
+  194812 => '沿',
+  194813 => '泍',
+  194814 => '汧',
+  194815 => '洖',
+  194816 => '派',
+  194817 => '海',
+  194818 => '流',
+  194819 => '浩',
+  194820 => '浸',
+  194821 => '涅',
+  194822 => '𣴞',
+  194823 => '洴',
+  194824 => '港',
+  194825 => '湮',
+  194826 => '㴳',
+  194827 => '滋',
+  194828 => '滇',
+  194829 => '𣻑',
+  194830 => '淹',
+  194831 => '潮',
+  194832 => '𣽞',
+  194833 => '𣾎',
+  194834 => '濆',
+  194835 => '瀹',
+  194836 => '瀞',
+  194837 => '瀛',
+  194838 => '㶖',
+  194839 => '灊',
+  194840 => '災',
+  194841 => '灷',
+  194842 => '炭',
+  194843 => '𠔥',
+  194844 => '煅',
+  194845 => '𤉣',
+  194846 => '熜',
+  194848 => '爨',
+  194849 => '爵',
+  194850 => '牐',
+  194851 => '𤘈',
+  194852 => '犀',
+  194853 => '犕',
+  194854 => '𤜵',
+  194855 => '𤠔',
+  194856 => '獺',
+  194857 => '王',
+  194858 => '㺬',
+  194859 => '玥',
+  194860 => '㺸',
+  194861 => '㺸',
+  194862 => '瑇',
+  194863 => '瑜',
+  194864 => '瑱',
+  194865 => '璅',
+  194866 => '瓊',
+  194867 => '㼛',
+  194868 => '甤',
+  194869 => '𤰶',
+  194870 => '甾',
+  194871 => '𤲒',
+  194872 => '異',
+  194873 => '𢆟',
+  194874 => '瘐',
+  194875 => '𤾡',
+  194876 => '𤾸',
+  194877 => '𥁄',
+  194878 => '㿼',
+  194879 => '䀈',
+  194880 => '直',
+  194881 => '𥃳',
+  194882 => '𥃲',
+  194883 => '𥄙',
+  194884 => '𥄳',
+  194885 => '眞',
+  194886 => '真',
+  194887 => '真',
+  194888 => '睊',
+  194889 => '䀹',
+  194890 => '瞋',
+  194891 => '䁆',
+  194892 => '䂖',
+  194893 => '𥐝',
+  194894 => '硎',
+  194895 => '碌',
+  194896 => '磌',
+  194897 => '䃣',
+  194898 => '𥘦',
+  194899 => '祖',
+  194900 => '𥚚',
+  194901 => '𥛅',
+  194902 => '福',
+  194903 => '秫',
+  194904 => '䄯',
+  194905 => '穀',
+  194906 => '穊',
+  194907 => '穏',
+  194908 => '𥥼',
+  194909 => '𥪧',
+  194910 => '𥪧',
+  194912 => '䈂',
+  194913 => '𥮫',
+  194914 => '篆',
+  194915 => '築',
+  194916 => '䈧',
+  194917 => '𥲀',
+  194918 => '糒',
+  194919 => '䊠',
+  194920 => '糨',
+  194921 => '糣',
+  194922 => '紀',
+  194923 => '𥾆',
+  194924 => '絣',
+  194925 => '䌁',
+  194926 => '緇',
+  194927 => '縂',
+  194928 => '繅',
+  194929 => '䌴',
+  194930 => '𦈨',
+  194931 => '𦉇',
+  194932 => '䍙',
+  194933 => '𦋙',
+  194934 => '罺',
+  194935 => '𦌾',
+  194936 => '羕',
+  194937 => '翺',
+  194938 => '者',
+  194939 => '𦓚',
+  194940 => '𦔣',
+  194941 => '聠',
+  194942 => '𦖨',
+  194943 => '聰',
+  194944 => '𣍟',
+  194945 => '䏕',
+  194946 => '育',
+  194947 => '脃',
+  194948 => '䐋',
+  194949 => '脾',
+  194950 => '媵',
+  194951 => '𦞧',
+  194952 => '𦞵',
+  194953 => '𣎓',
+  194954 => '𣎜',
+  194955 => '舁',
+  194956 => '舄',
+  194957 => '辞',
+  194958 => '䑫',
+  194959 => '芑',
+  194960 => '芋',
+  194961 => '芝',
+  194962 => '劳',
+  194963 => '花',
+  194964 => '芳',
+  194965 => '芽',
+  194966 => '苦',
+  194967 => '𦬼',
+  194968 => '若',
+  194969 => '茝',
+  194970 => '荣',
+  194971 => '莭',
+  194972 => '茣',
+  194973 => '莽',
+  194974 => '菧',
+  194975 => '著',
+  194976 => '荓',
+  194977 => '菊',
+  194978 => '菌',
+  194979 => '菜',
+  194980 => '𦰶',
+  194981 => '𦵫',
+  194982 => '𦳕',
+  194983 => '䔫',
+  194984 => '蓱',
+  194985 => '蓳',
+  194986 => '蔖',
+  194987 => '𧏊',
+  194988 => '蕤',
+  194989 => '𦼬',
+  194990 => '䕝',
+  194991 => '䕡',
+  194992 => '𦾱',
+  194993 => '𧃒',
+  194994 => '䕫',
+  194995 => '虐',
+  194996 => '虜',
+  194997 => '虧',
+  194998 => '虩',
+  194999 => '蚩',
+  195000 => '蚈',
+  195001 => '蜎',
+  195002 => '蛢',
+  195003 => '蝹',
+  195004 => '蜨',
+  195005 => '蝫',
+  195006 => '螆',
+  195008 => '蟡',
+  195009 => '蠁',
+  195010 => '䗹',
+  195011 => '衠',
+  195012 => '衣',
+  195013 => '𧙧',
+  195014 => '裗',
+  195015 => '裞',
+  195016 => '䘵',
+  195017 => '裺',
+  195018 => '㒻',
+  195019 => '𧢮',
+  195020 => '𧥦',
+  195021 => '䚾',
+  195022 => '䛇',
+  195023 => '誠',
+  195024 => '諭',
+  195025 => '變',
+  195026 => '豕',
+  195027 => '𧲨',
+  195028 => '貫',
+  195029 => '賁',
+  195030 => '贛',
+  195031 => '起',
+  195032 => '𧼯',
+  195033 => '𠠄',
+  195034 => '跋',
+  195035 => '趼',
+  195036 => '跰',
+  195037 => '𠣞',
+  195038 => '軔',
+  195039 => '輸',
+  195040 => '𨗒',
+  195041 => '𨗭',
+  195042 => '邔',
+  195043 => '郱',
+  195044 => '鄑',
+  195045 => '𨜮',
+  195046 => '鄛',
+  195047 => '鈸',
+  195048 => '鋗',
+  195049 => '鋘',
+  195050 => '鉼',
+  195051 => '鏹',
+  195052 => '鐕',
+  195053 => '𨯺',
+  195054 => '開',
+  195055 => '䦕',
+  195056 => '閷',
+  195057 => '𨵷',
+  195058 => '䧦',
+  195059 => '雃',
+  195060 => '嶲',
+  195061 => '霣',
+  195062 => '𩅅',
+  195063 => '𩈚',
+  195064 => '䩮',
+  195065 => '䩶',
+  195066 => '韠',
+  195067 => '𩐊',
+  195068 => '䪲',
+  195069 => '𩒖',
+  195070 => '頋',
+  195071 => '頋',
+  195072 => '頩',
+  195073 => '𩖶',
+  195074 => '飢',
+  195075 => '䬳',
+  195076 => '餩',
+  195077 => '馧',
+  195078 => '駂',
+  195079 => '駾',
+  195080 => '䯎',
+  195081 => '𩬰',
+  195082 => '鬒',
+  195083 => '鱀',
+  195084 => '鳽',
+  195085 => '䳎',
+  195086 => '䳭',
+  195087 => '鵧',
+  195088 => '𪃎',
+  195089 => '䳸',
+  195090 => '𪄅',
+  195091 => '𪈎',
+  195092 => '𪊑',
+  195093 => '麻',
+  195094 => '䵖',
+  195095 => '黹',
+  195096 => '黾',
+  195097 => '鼅',
+  195098 => '鼏',
+  195099 => '鼖',
+  195100 => '鼻',
+  195101 => '𪘀',
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php
new file mode 100644
index 000000000..1958e37ed
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php
@@ -0,0 +1,65 @@
+<?php
+
+return array (
+  2381 => 9,
+  2509 => 9,
+  2637 => 9,
+  2765 => 9,
+  2893 => 9,
+  3021 => 9,
+  3149 => 9,
+  3277 => 9,
+  3387 => 9,
+  3388 => 9,
+  3405 => 9,
+  3530 => 9,
+  3642 => 9,
+  3770 => 9,
+  3972 => 9,
+  4153 => 9,
+  4154 => 9,
+  5908 => 9,
+  5940 => 9,
+  6098 => 9,
+  6752 => 9,
+  6980 => 9,
+  7082 => 9,
+  7083 => 9,
+  7154 => 9,
+  7155 => 9,
+  11647 => 9,
+  43014 => 9,
+  43052 => 9,
+  43204 => 9,
+  43347 => 9,
+  43456 => 9,
+  43766 => 9,
+  44013 => 9,
+  68159 => 9,
+  69702 => 9,
+  69759 => 9,
+  69817 => 9,
+  69939 => 9,
+  69940 => 9,
+  70080 => 9,
+  70197 => 9,
+  70378 => 9,
+  70477 => 9,
+  70722 => 9,
+  70850 => 9,
+  71103 => 9,
+  71231 => 9,
+  71350 => 9,
+  71467 => 9,
+  71737 => 9,
+  71997 => 9,
+  71998 => 9,
+  72160 => 9,
+  72244 => 9,
+  72263 => 9,
+  72345 => 9,
+  72767 => 9,
+  73028 => 9,
+  73029 => 9,
+  73111 => 9,
+);
diff --git a/lib/symfony/polyfill-intl-idn/bootstrap.php b/lib/symfony/polyfill-intl-idn/bootstrap.php
new file mode 100644
index 000000000..f02d5de73
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/bootstrap.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Intl\Idn as p;
+
+if (extension_loaded('intl')) {
+    return;
+}
+
+if (!defined('U_IDNA_PROHIBITED_ERROR')) {
+    define('U_IDNA_PROHIBITED_ERROR', 66560);
+}
+if (!defined('U_IDNA_ERROR_START')) {
+    define('U_IDNA_ERROR_START', 66560);
+}
+if (!defined('U_IDNA_UNASSIGNED_ERROR')) {
+    define('U_IDNA_UNASSIGNED_ERROR', 66561);
+}
+if (!defined('U_IDNA_CHECK_BIDI_ERROR')) {
+    define('U_IDNA_CHECK_BIDI_ERROR', 66562);
+}
+if (!defined('U_IDNA_STD3_ASCII_RULES_ERROR')) {
+    define('U_IDNA_STD3_ASCII_RULES_ERROR', 66563);
+}
+if (!defined('U_IDNA_ACE_PREFIX_ERROR')) {
+    define('U_IDNA_ACE_PREFIX_ERROR', 66564);
+}
+if (!defined('U_IDNA_VERIFICATION_ERROR')) {
+    define('U_IDNA_VERIFICATION_ERROR', 66565);
+}
+if (!defined('U_IDNA_LABEL_TOO_LONG_ERROR')) {
+    define('U_IDNA_LABEL_TOO_LONG_ERROR', 66566);
+}
+if (!defined('U_IDNA_ZERO_LENGTH_LABEL_ERROR')) {
+    define('U_IDNA_ZERO_LENGTH_LABEL_ERROR', 66567);
+}
+if (!defined('U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR')) {
+    define('U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR', 66568);
+}
+if (!defined('U_IDNA_ERROR_LIMIT')) {
+    define('U_IDNA_ERROR_LIMIT', 66569);
+}
+if (!defined('U_STRINGPREP_PROHIBITED_ERROR')) {
+    define('U_STRINGPREP_PROHIBITED_ERROR', 66560);
+}
+if (!defined('U_STRINGPREP_UNASSIGNED_ERROR')) {
+    define('U_STRINGPREP_UNASSIGNED_ERROR', 66561);
+}
+if (!defined('U_STRINGPREP_CHECK_BIDI_ERROR')) {
+    define('U_STRINGPREP_CHECK_BIDI_ERROR', 66562);
+}
+if (!defined('IDNA_DEFAULT')) {
+    define('IDNA_DEFAULT', 0);
+}
+if (!defined('IDNA_ALLOW_UNASSIGNED')) {
+    define('IDNA_ALLOW_UNASSIGNED', 1);
+}
+if (!defined('IDNA_USE_STD3_RULES')) {
+    define('IDNA_USE_STD3_RULES', 2);
+}
+if (!defined('IDNA_CHECK_BIDI')) {
+    define('IDNA_CHECK_BIDI', 4);
+}
+if (!defined('IDNA_CHECK_CONTEXTJ')) {
+    define('IDNA_CHECK_CONTEXTJ', 8);
+}
+if (!defined('IDNA_NONTRANSITIONAL_TO_ASCII')) {
+    define('IDNA_NONTRANSITIONAL_TO_ASCII', 16);
+}
+if (!defined('IDNA_NONTRANSITIONAL_TO_UNICODE')) {
+    define('IDNA_NONTRANSITIONAL_TO_UNICODE', 32);
+}
+if (!defined('INTL_IDNA_VARIANT_2003')) {
+    define('INTL_IDNA_VARIANT_2003', 0);
+}
+if (!defined('INTL_IDNA_VARIANT_UTS46')) {
+    define('INTL_IDNA_VARIANT_UTS46', 1);
+}
+if (!defined('IDNA_ERROR_EMPTY_LABEL')) {
+    define('IDNA_ERROR_EMPTY_LABEL', 1);
+}
+if (!defined('IDNA_ERROR_LABEL_TOO_LONG')) {
+    define('IDNA_ERROR_LABEL_TOO_LONG', 2);
+}
+if (!defined('IDNA_ERROR_DOMAIN_NAME_TOO_LONG')) {
+    define('IDNA_ERROR_DOMAIN_NAME_TOO_LONG', 4);
+}
+if (!defined('IDNA_ERROR_LEADING_HYPHEN')) {
+    define('IDNA_ERROR_LEADING_HYPHEN', 8);
+}
+if (!defined('IDNA_ERROR_TRAILING_HYPHEN')) {
+    define('IDNA_ERROR_TRAILING_HYPHEN', 16);
+}
+if (!defined('IDNA_ERROR_HYPHEN_3_4')) {
+    define('IDNA_ERROR_HYPHEN_3_4', 32);
+}
+if (!defined('IDNA_ERROR_LEADING_COMBINING_MARK')) {
+    define('IDNA_ERROR_LEADING_COMBINING_MARK', 64);
+}
+if (!defined('IDNA_ERROR_DISALLOWED')) {
+    define('IDNA_ERROR_DISALLOWED', 128);
+}
+if (!defined('IDNA_ERROR_PUNYCODE')) {
+    define('IDNA_ERROR_PUNYCODE', 256);
+}
+if (!defined('IDNA_ERROR_LABEL_HAS_DOT')) {
+    define('IDNA_ERROR_LABEL_HAS_DOT', 512);
+}
+if (!defined('IDNA_ERROR_INVALID_ACE_LABEL')) {
+    define('IDNA_ERROR_INVALID_ACE_LABEL', 1024);
+}
+if (!defined('IDNA_ERROR_BIDI')) {
+    define('IDNA_ERROR_BIDI', 2048);
+}
+if (!defined('IDNA_ERROR_CONTEXTJ')) {
+    define('IDNA_ERROR_CONTEXTJ', 4096);
+}
+
+if (PHP_VERSION_ID < 70400) {
+    if (!function_exists('idn_to_ascii')) {
+        function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); }
+    }
+    if (!function_exists('idn_to_utf8')) {
+        function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); }
+    }
+} else {
+    if (!function_exists('idn_to_ascii')) {
+        function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); }
+    }
+    if (!function_exists('idn_to_utf8')) {
+        function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); }
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/composer.json b/lib/symfony/polyfill-intl-idn/composer.json
new file mode 100644
index 000000000..bd89e6ed7
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/composer.json
@@ -0,0 +1,45 @@
+{
+    "name": "symfony/polyfill-intl-idn",
+    "type": "library",
+    "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "intl", "idn"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Laurent Bassin",
+            "email": "laurent@bassin.info"
+        },
+        {
+            "name": "Trevor Rowbotham",
+            "email": "trevor.rowbotham@pm.me"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "symfony/polyfill-intl-normalizer": "^1.10",
+        "symfony/polyfill-php70": "^1.10",
+        "symfony/polyfill-php72": "^1.10"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Intl\\Idn\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "suggest": {
+        "ext-intl": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/LICENSE b/lib/symfony/polyfill-intl-normalizer/LICENSE
new file mode 100644
index 000000000..4cd8bdd30
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-intl-normalizer/Normalizer.php b/lib/symfony/polyfill-intl-normalizer/Normalizer.php
new file mode 100644
index 000000000..a60fae620
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Normalizer.php
@@ -0,0 +1,308 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Intl\Normalizer;
+
+/**
+ * Normalizer is a PHP fallback implementation of the Normalizer class provided by the intl extension.
+ *
+ * It has been validated with Unicode 6.3 Normalization Conformance Test.
+ * See http://www.unicode.org/reports/tr15/ for detailed info about Unicode normalizations.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Normalizer
+{
+    const FORM_D = \Normalizer::FORM_D;
+    const FORM_KD = \Normalizer::FORM_KD;
+    const FORM_C = \Normalizer::FORM_C;
+    const FORM_KC = \Normalizer::FORM_KC;
+    const NFD = \Normalizer::NFD;
+    const NFKD = \Normalizer::NFKD;
+    const NFC = \Normalizer::NFC;
+    const NFKC = \Normalizer::NFKC;
+
+    private static $C;
+    private static $D;
+    private static $KD;
+    private static $cC;
+    private static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
+    private static $ASCII = "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F";
+
+    public static function isNormalized($s, $form = self::NFC)
+    {
+        if (!\in_array($form, array(self::NFD, self::NFKD, self::NFC, self::NFKC))) {
+            return false;
+        }
+        $s = (string) $s;
+        if (!isset($s[strspn($s, self::$ASCII)])) {
+            return true;
+        }
+        if (self::NFC == $form && preg_match('//u', $s) && !preg_match('/[^\x00-\x{2FF}]/u', $s)) {
+            return true;
+        }
+
+        return self::normalize($s, $form) === $s;
+    }
+
+    public static function normalize($s, $form = self::NFC)
+    {
+        $s = (string) $s;
+        if (!preg_match('//u', $s)) {
+            return false;
+        }
+
+        switch ($form) {
+            case self::NFC: $C = true; $K = false; break;
+            case self::NFD: $C = false; $K = false; break;
+            case self::NFKC: $C = true; $K = true; break;
+            case self::NFKD: $C = false; $K = true; break;
+            default:
+                if (\defined('Normalizer::NONE') && \Normalizer::NONE == $form) {
+                    return $s;
+                }
+
+                return false;
+        }
+
+        if ('' === $s) {
+            return '';
+        }
+
+        if ($K && null === self::$KD) {
+            self::$KD = self::getData('compatibilityDecomposition');
+        }
+
+        if (null === self::$D) {
+            self::$D = self::getData('canonicalDecomposition');
+            self::$cC = self::getData('combiningClass');
+        }
+
+        if (null !== $mbEncoding = (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) ? mb_internal_encoding() : null) {
+            mb_internal_encoding('8bit');
+        }
+
+        $r = self::decompose($s, $K);
+
+        if ($C) {
+            if (null === self::$C) {
+                self::$C = self::getData('canonicalComposition');
+            }
+
+            $r = self::recompose($r);
+        }
+        if (null !== $mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        return $r;
+    }
+
+    private static function recompose($s)
+    {
+        $ASCII = self::$ASCII;
+        $compMap = self::$C;
+        $combClass = self::$cC;
+        $ulenMask = self::$ulenMask;
+
+        $result = $tail = '';
+
+        $i = $s[0] < "\x80" ? 1 : $ulenMask[$s[0] & "\xF0"];
+        $len = \strlen($s);
+
+        $lastUchr = substr($s, 0, $i);
+        $lastUcls = isset($combClass[$lastUchr]) ? 256 : 0;
+
+        while ($i < $len) {
+            if ($s[$i] < "\x80") {
+                // ASCII chars
+
+                if ($tail) {
+                    $lastUchr .= $tail;
+                    $tail = '';
+                }
+
+                if ($j = strspn($s, $ASCII, $i + 1)) {
+                    $lastUchr .= substr($s, $i, $j);
+                    $i += $j;
+                }
+
+                $result .= $lastUchr;
+                $lastUchr = $s[$i];
+                $lastUcls = 0;
+                ++$i;
+                continue;
+            }
+
+            $ulen = $ulenMask[$s[$i] & "\xF0"];
+            $uchr = substr($s, $i, $ulen);
+
+            if ($lastUchr < "\xE1\x84\x80" || "\xE1\x84\x92" < $lastUchr
+                || $uchr < "\xE1\x85\xA1" || "\xE1\x85\xB5" < $uchr
+                || $lastUcls) {
+                // Table lookup and combining chars composition
+
+                $ucls = isset($combClass[$uchr]) ? $combClass[$uchr] : 0;
+
+                if (isset($compMap[$lastUchr.$uchr]) && (!$lastUcls || $lastUcls < $ucls)) {
+                    $lastUchr = $compMap[$lastUchr.$uchr];
+                } elseif ($lastUcls = $ucls) {
+                    $tail .= $uchr;
+                } else {
+                    if ($tail) {
+                        $lastUchr .= $tail;
+                        $tail = '';
+                    }
+
+                    $result .= $lastUchr;
+                    $lastUchr = $uchr;
+                }
+            } else {
+                // Hangul chars
+
+                $L = \ord($lastUchr[2]) - 0x80;
+                $V = \ord($uchr[2]) - 0xA1;
+                $T = 0;
+
+                $uchr = substr($s, $i + $ulen, 3);
+
+                if ("\xE1\x86\xA7" <= $uchr && $uchr <= "\xE1\x87\x82") {
+                    $T = \ord($uchr[2]) - 0xA7;
+                    0 > $T && $T += 0x40;
+                    $ulen += 3;
+                }
+
+                $L = 0xAC00 + ($L * 21 + $V) * 28 + $T;
+                $lastUchr = \chr(0xE0 | $L >> 12).\chr(0x80 | $L >> 6 & 0x3F).\chr(0x80 | $L & 0x3F);
+            }
+
+            $i += $ulen;
+        }
+
+        return $result.$lastUchr.$tail;
+    }
+
+    private static function decompose($s, $c)
+    {
+        $result = '';
+
+        $ASCII = self::$ASCII;
+        $decompMap = self::$D;
+        $combClass = self::$cC;
+        $ulenMask = self::$ulenMask;
+        if ($c) {
+            $compatMap = self::$KD;
+        }
+
+        $c = array();
+        $i = 0;
+        $len = \strlen($s);
+
+        while ($i < $len) {
+            if ($s[$i] < "\x80") {
+                // ASCII chars
+
+                if ($c) {
+                    ksort($c);
+                    $result .= implode('', $c);
+                    $c = array();
+                }
+
+                $j = 1 + strspn($s, $ASCII, $i + 1);
+                $result .= substr($s, $i, $j);
+                $i += $j;
+                continue;
+            }
+
+            $ulen = $ulenMask[$s[$i] & "\xF0"];
+            $uchr = substr($s, $i, $ulen);
+            $i += $ulen;
+
+            if ($uchr < "\xEA\xB0\x80" || "\xED\x9E\xA3" < $uchr) {
+                // Table lookup
+
+                if ($uchr !== $j = isset($compatMap[$uchr]) ? $compatMap[$uchr] : (isset($decompMap[$uchr]) ? $decompMap[$uchr] : $uchr)) {
+                    $uchr = $j;
+
+                    $j = \strlen($uchr);
+                    $ulen = $uchr[0] < "\x80" ? 1 : $ulenMask[$uchr[0] & "\xF0"];
+
+                    if ($ulen != $j) {
+                        // Put trailing chars in $s
+
+                        $j -= $ulen;
+                        $i -= $j;
+
+                        if (0 > $i) {
+                            $s = str_repeat(' ', -$i).$s;
+                            $len -= $i;
+                            $i = 0;
+                        }
+
+                        while ($j--) {
+                            $s[$i + $j] = $uchr[$ulen + $j];
+                        }
+
+                        $uchr = substr($uchr, 0, $ulen);
+                    }
+                }
+                if (isset($combClass[$uchr])) {
+                    // Combining chars, for sorting
+
+                    if (!isset($c[$combClass[$uchr]])) {
+                        $c[$combClass[$uchr]] = '';
+                    }
+                    $c[$combClass[$uchr]] .= $uchr;
+                    continue;
+                }
+            } else {
+                // Hangul chars
+
+                $uchr = unpack('C*', $uchr);
+                $j = (($uchr[1] - 224) << 12) + (($uchr[2] - 128) << 6) + $uchr[3] - 0xAC80;
+
+                $uchr = "\xE1\x84".\chr(0x80 + (int) ($j / 588))
+                       ."\xE1\x85".\chr(0xA1 + (int) (($j % 588) / 28));
+
+                if ($j %= 28) {
+                    $uchr .= $j < 25
+                        ? ("\xE1\x86".\chr(0xA7 + $j))
+                        : ("\xE1\x87".\chr(0x67 + $j));
+                }
+            }
+            if ($c) {
+                ksort($c);
+                $result .= implode('', $c);
+                $c = array();
+            }
+
+            $result .= $uchr;
+        }
+
+        if ($c) {
+            ksort($c);
+            $result .= implode('', $c);
+        }
+
+        return $result;
+    }
+
+    private static function getData($file)
+    {
+        if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.php')) {
+            return require $file;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/README.md b/lib/symfony/polyfill-intl-normalizer/README.md
new file mode 100644
index 000000000..15060c5f1
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/README.md
@@ -0,0 +1,14 @@
+Symfony Polyfill / Intl: Normalizer
+===================================
+
+This component provides a fallback implementation for the
+[`Normalizer`](https://php.net/Normalizer) class provided
+by the [Intl](https://php.net/intl) extension.
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php b/lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php
new file mode 100644
index 000000000..ca18eff36
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php
@@ -0,0 +1,17 @@
+<?php
+
+class Normalizer extends Symfony\Polyfill\Intl\Normalizer\Normalizer
+{
+    /**
+     * @deprecated since ICU 56 and removed in PHP 8
+     */
+    const NONE = 1;
+    const FORM_D = 2;
+    const FORM_KD = 3;
+    const FORM_C = 4;
+    const FORM_KC = 5;
+    const NFD = 2;
+    const NFKD = 3;
+    const NFC = 4;
+    const NFKC = 5;
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php
new file mode 100644
index 000000000..db4764419
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php
@@ -0,0 +1,945 @@
+<?php
+
+return array (
+  'À' => 'À',
+  'Á' => 'Á',
+  'Â' => 'Â',
+  'Ã' => 'Ã',
+  'Ä' => 'Ä',
+  'Å' => 'Å',
+  'Ç' => 'Ç',
+  'È' => 'È',
+  'É' => 'É',
+  'Ê' => 'Ê',
+  'Ë' => 'Ë',
+  'Ì' => 'Ì',
+  'Í' => 'Í',
+  'Î' => 'Î',
+  'Ï' => 'Ï',
+  'Ñ' => 'Ñ',
+  'Ò' => 'Ò',
+  'Ó' => 'Ó',
+  'Ô' => 'Ô',
+  'Õ' => 'Õ',
+  'Ö' => 'Ö',
+  'Ù' => 'Ù',
+  'Ú' => 'Ú',
+  'Û' => 'Û',
+  'Ü' => 'Ü',
+  'Ý' => 'Ý',
+  'à' => 'à',
+  'á' => 'á',
+  'â' => 'â',
+  'ã' => 'ã',
+  'ä' => 'ä',
+  'å' => 'å',
+  'ç' => 'ç',
+  'è' => 'è',
+  'é' => 'é',
+  'ê' => 'ê',
+  'ë' => 'ë',
+  'ì' => 'ì',
+  'í' => 'í',
+  'î' => 'î',
+  'ï' => 'ï',
+  'ñ' => 'ñ',
+  'ò' => 'ò',
+  'ó' => 'ó',
+  'ô' => 'ô',
+  'õ' => 'õ',
+  'ö' => 'ö',
+  'ù' => 'ù',
+  'ú' => 'ú',
+  'û' => 'û',
+  'ü' => 'ü',
+  'ý' => 'ý',
+  'ÿ' => 'ÿ',
+  'Ā' => 'Ā',
+  'ā' => 'ā',
+  'Ă' => 'Ă',
+  'ă' => 'ă',
+  'Ą' => 'Ą',
+  'ą' => 'ą',
+  'Ć' => 'Ć',
+  'ć' => 'ć',
+  'Ĉ' => 'Ĉ',
+  'ĉ' => 'ĉ',
+  'Ċ' => 'Ċ',
+  'ċ' => 'ċ',
+  'Č' => 'Č',
+  'č' => 'č',
+  'Ď' => 'Ď',
+  'ď' => 'ď',
+  'Ē' => 'Ē',
+  'ē' => 'ē',
+  'Ĕ' => 'Ĕ',
+  'ĕ' => 'ĕ',
+  'Ė' => 'Ė',
+  'ė' => 'ė',
+  'Ę' => 'Ę',
+  'ę' => 'ę',
+  'Ě' => 'Ě',
+  'ě' => 'ě',
+  'Ĝ' => 'Ĝ',
+  'ĝ' => 'ĝ',
+  'Ğ' => 'Ğ',
+  'ğ' => 'ğ',
+  'Ġ' => 'Ġ',
+  'ġ' => 'ġ',
+  'Ģ' => 'Ģ',
+  'ģ' => 'ģ',
+  'Ĥ' => 'Ĥ',
+  'ĥ' => 'ĥ',
+  'Ĩ' => 'Ĩ',
+  'ĩ' => 'ĩ',
+  'Ī' => 'Ī',
+  'ī' => 'ī',
+  'Ĭ' => 'Ĭ',
+  'ĭ' => 'ĭ',
+  'Į' => 'Į',
+  'į' => 'į',
+  'İ' => 'İ',
+  'Ĵ' => 'Ĵ',
+  'ĵ' => 'ĵ',
+  'Ķ' => 'Ķ',
+  'ķ' => 'ķ',
+  'Ĺ' => 'Ĺ',
+  'ĺ' => 'ĺ',
+  'Ļ' => 'Ļ',
+  'ļ' => 'ļ',
+  'Ľ' => 'Ľ',
+  'ľ' => 'ľ',
+  'Ń' => 'Ń',
+  'ń' => 'ń',
+  'Ņ' => 'Ņ',
+  'ņ' => 'ņ',
+  'Ň' => 'Ň',
+  'ň' => 'ň',
+  'Ō' => 'Ō',
+  'ō' => 'ō',
+  'Ŏ' => 'Ŏ',
+  'ŏ' => 'ŏ',
+  'Ő' => 'Ő',
+  'ő' => 'ő',
+  'Ŕ' => 'Ŕ',
+  'ŕ' => 'ŕ',
+  'Ŗ' => 'Ŗ',
+  'ŗ' => 'ŗ',
+  'Ř' => 'Ř',
+  'ř' => 'ř',
+  'Ś' => 'Ś',
+  'ś' => 'ś',
+  'Ŝ' => 'Ŝ',
+  'ŝ' => 'ŝ',
+  'Ş' => 'Ş',
+  'ş' => 'ş',
+  'Š' => 'Š',
+  'š' => 'š',
+  'Ţ' => 'Ţ',
+  'ţ' => 'ţ',
+  'Ť' => 'Ť',
+  'ť' => 'ť',
+  'Ũ' => 'Ũ',
+  'ũ' => 'ũ',
+  'Ū' => 'Ū',
+  'ū' => 'ū',
+  'Ŭ' => 'Ŭ',
+  'ŭ' => 'ŭ',
+  'Ů' => 'Ů',
+  'ů' => 'ů',
+  'Ű' => 'Ű',
+  'ű' => 'ű',
+  'Ų' => 'Ų',
+  'ų' => 'ų',
+  'Ŵ' => 'Ŵ',
+  'ŵ' => 'ŵ',
+  'Ŷ' => 'Ŷ',
+  'ŷ' => 'ŷ',
+  'Ÿ' => 'Ÿ',
+  'Ź' => 'Ź',
+  'ź' => 'ź',
+  'Ż' => 'Ż',
+  'ż' => 'ż',
+  'Ž' => 'Ž',
+  'ž' => 'ž',
+  'Ơ' => 'Ơ',
+  'ơ' => 'ơ',
+  'Ư' => 'Ư',
+  'ư' => 'ư',
+  'Ǎ' => 'Ǎ',
+  'ǎ' => 'ǎ',
+  'Ǐ' => 'Ǐ',
+  'ǐ' => 'ǐ',
+  'Ǒ' => 'Ǒ',
+  'ǒ' => 'ǒ',
+  'Ǔ' => 'Ǔ',
+  'ǔ' => 'ǔ',
+  'Ǖ' => 'Ǖ',
+  'ǖ' => 'ǖ',
+  'Ǘ' => 'Ǘ',
+  'ǘ' => 'ǘ',
+  'Ǚ' => 'Ǚ',
+  'ǚ' => 'ǚ',
+  'Ǜ' => 'Ǜ',
+  'ǜ' => 'ǜ',
+  'Ǟ' => 'Ǟ',
+  'ǟ' => 'ǟ',
+  'Ǡ' => 'Ǡ',
+  'ǡ' => 'ǡ',
+  'Ǣ' => 'Ǣ',
+  'ǣ' => 'ǣ',
+  'Ǧ' => 'Ǧ',
+  'ǧ' => 'ǧ',
+  'Ǩ' => 'Ǩ',
+  'ǩ' => 'ǩ',
+  'Ǫ' => 'Ǫ',
+  'ǫ' => 'ǫ',
+  'Ǭ' => 'Ǭ',
+  'ǭ' => 'ǭ',
+  'Ǯ' => 'Ǯ',
+  'ǯ' => 'ǯ',
+  'ǰ' => 'ǰ',
+  'Ǵ' => 'Ǵ',
+  'ǵ' => 'ǵ',
+  'Ǹ' => 'Ǹ',
+  'ǹ' => 'ǹ',
+  'Ǻ' => 'Ǻ',
+  'ǻ' => 'ǻ',
+  'Ǽ' => 'Ǽ',
+  'ǽ' => 'ǽ',
+  'Ǿ' => 'Ǿ',
+  'ǿ' => 'ǿ',
+  'Ȁ' => 'Ȁ',
+  'ȁ' => 'ȁ',
+  'Ȃ' => 'Ȃ',
+  'ȃ' => 'ȃ',
+  'Ȅ' => 'Ȅ',
+  'ȅ' => 'ȅ',
+  'Ȇ' => 'Ȇ',
+  'ȇ' => 'ȇ',
+  'Ȉ' => 'Ȉ',
+  'ȉ' => 'ȉ',
+  'Ȋ' => 'Ȋ',
+  'ȋ' => 'ȋ',
+  'Ȍ' => 'Ȍ',
+  'ȍ' => 'ȍ',
+  'Ȏ' => 'Ȏ',
+  'ȏ' => 'ȏ',
+  'Ȑ' => 'Ȑ',
+  'ȑ' => 'ȑ',
+  'Ȓ' => 'Ȓ',
+  'ȓ' => 'ȓ',
+  'Ȕ' => 'Ȕ',
+  'ȕ' => 'ȕ',
+  'Ȗ' => 'Ȗ',
+  'ȗ' => 'ȗ',
+  'Ș' => 'Ș',
+  'ș' => 'ș',
+  'Ț' => 'Ț',
+  'ț' => 'ț',
+  'Ȟ' => 'Ȟ',
+  'ȟ' => 'ȟ',
+  'Ȧ' => 'Ȧ',
+  'ȧ' => 'ȧ',
+  'Ȩ' => 'Ȩ',
+  'ȩ' => 'ȩ',
+  'Ȫ' => 'Ȫ',
+  'ȫ' => 'ȫ',
+  'Ȭ' => 'Ȭ',
+  'ȭ' => 'ȭ',
+  'Ȯ' => 'Ȯ',
+  'ȯ' => 'ȯ',
+  'Ȱ' => 'Ȱ',
+  'ȱ' => 'ȱ',
+  'Ȳ' => 'Ȳ',
+  'ȳ' => 'ȳ',
+  '΅' => '΅',
+  'Ά' => 'Ά',
+  'Έ' => 'Έ',
+  'Ή' => 'Ή',
+  'Ί' => 'Ί',
+  'Ό' => 'Ό',
+  'Ύ' => 'Ύ',
+  'Ώ' => 'Ώ',
+  'ΐ' => 'ΐ',
+  'Ϊ' => 'Ϊ',
+  'Ϋ' => 'Ϋ',
+  'ά' => 'ά',
+  'έ' => 'έ',
+  'ή' => 'ή',
+  'ί' => 'ί',
+  'ΰ' => 'ΰ',
+  'ϊ' => 'ϊ',
+  'ϋ' => 'ϋ',
+  'ό' => 'ό',
+  'ύ' => 'ύ',
+  'ώ' => 'ώ',
+  'ϓ' => 'ϓ',
+  'ϔ' => 'ϔ',
+  'Ѐ' => 'Ѐ',
+  'Ё' => 'Ё',
+  'Ѓ' => 'Ѓ',
+  'Ї' => 'Ї',
+  'Ќ' => 'Ќ',
+  'Ѝ' => 'Ѝ',
+  'Ў' => 'Ў',
+  'Й' => 'Й',
+  'й' => 'й',
+  'ѐ' => 'ѐ',
+  'ё' => 'ё',
+  'ѓ' => 'ѓ',
+  'ї' => 'ї',
+  'ќ' => 'ќ',
+  'ѝ' => 'ѝ',
+  'ў' => 'ў',
+  'Ѷ' => 'Ѷ',
+  'ѷ' => 'ѷ',
+  'Ӂ' => 'Ӂ',
+  'ӂ' => 'ӂ',
+  'Ӑ' => 'Ӑ',
+  'ӑ' => 'ӑ',
+  'Ӓ' => 'Ӓ',
+  'ӓ' => 'ӓ',
+  'Ӗ' => 'Ӗ',
+  'ӗ' => 'ӗ',
+  'Ӛ' => 'Ӛ',
+  'ӛ' => 'ӛ',
+  'Ӝ' => 'Ӝ',
+  'ӝ' => 'ӝ',
+  'Ӟ' => 'Ӟ',
+  'ӟ' => 'ӟ',
+  'Ӣ' => 'Ӣ',
+  'ӣ' => 'ӣ',
+  'Ӥ' => 'Ӥ',
+  'ӥ' => 'ӥ',
+  'Ӧ' => 'Ӧ',
+  'ӧ' => 'ӧ',
+  'Ӫ' => 'Ӫ',
+  'ӫ' => 'ӫ',
+  'Ӭ' => 'Ӭ',
+  'ӭ' => 'ӭ',
+  'Ӯ' => 'Ӯ',
+  'ӯ' => 'ӯ',
+  'Ӱ' => 'Ӱ',
+  'ӱ' => 'ӱ',
+  'Ӳ' => 'Ӳ',
+  'ӳ' => 'ӳ',
+  'Ӵ' => 'Ӵ',
+  'ӵ' => 'ӵ',
+  'Ӹ' => 'Ӹ',
+  'ӹ' => 'ӹ',
+  'آ' => 'آ',
+  'أ' => 'أ',
+  'ؤ' => 'ؤ',
+  'إ' => 'إ',
+  'ئ' => 'ئ',
+  'ۀ' => 'ۀ',
+  'ۂ' => 'ۂ',
+  'ۓ' => 'ۓ',
+  'ऩ' => 'ऩ',
+  'ऱ' => 'ऱ',
+  'ऴ' => 'ऴ',
+  'ো' => 'ো',
+  'ৌ' => 'ৌ',
+  'ୈ' => 'ୈ',
+  'ୋ' => 'ୋ',
+  'ୌ' => 'ୌ',
+  'ஔ' => 'ஔ',
+  'ொ' => 'ொ',
+  'ோ' => 'ோ',
+  'ௌ' => 'ௌ',
+  'ై' => 'ై',
+  'ೀ' => 'ೀ',
+  'ೇ' => 'ೇ',
+  'ೈ' => 'ೈ',
+  'ೊ' => 'ೊ',
+  'ೋ' => 'ೋ',
+  'ൊ' => 'ൊ',
+  'ോ' => 'ോ',
+  'ൌ' => 'ൌ',
+  'ේ' => 'ේ',
+  'ො' => 'ො',
+  'ෝ' => 'ෝ',
+  'ෞ' => 'ෞ',
+  'ဦ' => 'ဦ',
+  'ᬆ' => 'ᬆ',
+  'ᬈ' => 'ᬈ',
+  'ᬊ' => 'ᬊ',
+  'ᬌ' => 'ᬌ',
+  'ᬎ' => 'ᬎ',
+  'ᬒ' => 'ᬒ',
+  'ᬻ' => 'ᬻ',
+  'ᬽ' => 'ᬽ',
+  'ᭀ' => 'ᭀ',
+  'ᭁ' => 'ᭁ',
+  'ᭃ' => 'ᭃ',
+  'Ḁ' => 'Ḁ',
+  'ḁ' => 'ḁ',
+  'Ḃ' => 'Ḃ',
+  'ḃ' => 'ḃ',
+  'Ḅ' => 'Ḅ',
+  'ḅ' => 'ḅ',
+  'Ḇ' => 'Ḇ',
+  'ḇ' => 'ḇ',
+  'Ḉ' => 'Ḉ',
+  'ḉ' => 'ḉ',
+  'Ḋ' => 'Ḋ',
+  'ḋ' => 'ḋ',
+  'Ḍ' => 'Ḍ',
+  'ḍ' => 'ḍ',
+  'Ḏ' => 'Ḏ',
+  'ḏ' => 'ḏ',
+  'Ḑ' => 'Ḑ',
+  'ḑ' => 'ḑ',
+  'Ḓ' => 'Ḓ',
+  'ḓ' => 'ḓ',
+  'Ḕ' => 'Ḕ',
+  'ḕ' => 'ḕ',
+  'Ḗ' => 'Ḗ',
+  'ḗ' => 'ḗ',
+  'Ḙ' => 'Ḙ',
+  'ḙ' => 'ḙ',
+  'Ḛ' => 'Ḛ',
+  'ḛ' => 'ḛ',
+  'Ḝ' => 'Ḝ',
+  'ḝ' => 'ḝ',
+  'Ḟ' => 'Ḟ',
+  'ḟ' => 'ḟ',
+  'Ḡ' => 'Ḡ',
+  'ḡ' => 'ḡ',
+  'Ḣ' => 'Ḣ',
+  'ḣ' => 'ḣ',
+  'Ḥ' => 'Ḥ',
+  'ḥ' => 'ḥ',
+  'Ḧ' => 'Ḧ',
+  'ḧ' => 'ḧ',
+  'Ḩ' => 'Ḩ',
+  'ḩ' => 'ḩ',
+  'Ḫ' => 'Ḫ',
+  'ḫ' => 'ḫ',
+  'Ḭ' => 'Ḭ',
+  'ḭ' => 'ḭ',
+  'Ḯ' => 'Ḯ',
+  'ḯ' => 'ḯ',
+  'Ḱ' => 'Ḱ',
+  'ḱ' => 'ḱ',
+  'Ḳ' => 'Ḳ',
+  'ḳ' => 'ḳ',
+  'Ḵ' => 'Ḵ',
+  'ḵ' => 'ḵ',
+  'Ḷ' => 'Ḷ',
+  'ḷ' => 'ḷ',
+  'Ḹ' => 'Ḹ',
+  'ḹ' => 'ḹ',
+  'Ḻ' => 'Ḻ',
+  'ḻ' => 'ḻ',
+  'Ḽ' => 'Ḽ',
+  'ḽ' => 'ḽ',
+  'Ḿ' => 'Ḿ',
+  'ḿ' => 'ḿ',
+  'Ṁ' => 'Ṁ',
+  'ṁ' => 'ṁ',
+  'Ṃ' => 'Ṃ',
+  'ṃ' => 'ṃ',
+  'Ṅ' => 'Ṅ',
+  'ṅ' => 'ṅ',
+  'Ṇ' => 'Ṇ',
+  'ṇ' => 'ṇ',
+  'Ṉ' => 'Ṉ',
+  'ṉ' => 'ṉ',
+  'Ṋ' => 'Ṋ',
+  'ṋ' => 'ṋ',
+  'Ṍ' => 'Ṍ',
+  'ṍ' => 'ṍ',
+  'Ṏ' => 'Ṏ',
+  'ṏ' => 'ṏ',
+  'Ṑ' => 'Ṑ',
+  'ṑ' => 'ṑ',
+  'Ṓ' => 'Ṓ',
+  'ṓ' => 'ṓ',
+  'Ṕ' => 'Ṕ',
+  'ṕ' => 'ṕ',
+  'Ṗ' => 'Ṗ',
+  'ṗ' => 'ṗ',
+  'Ṙ' => 'Ṙ',
+  'ṙ' => 'ṙ',
+  'Ṛ' => 'Ṛ',
+  'ṛ' => 'ṛ',
+  'Ṝ' => 'Ṝ',
+  'ṝ' => 'ṝ',
+  'Ṟ' => 'Ṟ',
+  'ṟ' => 'ṟ',
+  'Ṡ' => 'Ṡ',
+  'ṡ' => 'ṡ',
+  'Ṣ' => 'Ṣ',
+  'ṣ' => 'ṣ',
+  'Ṥ' => 'Ṥ',
+  'ṥ' => 'ṥ',
+  'Ṧ' => 'Ṧ',
+  'ṧ' => 'ṧ',
+  'Ṩ' => 'Ṩ',
+  'ṩ' => 'ṩ',
+  'Ṫ' => 'Ṫ',
+  'ṫ' => 'ṫ',
+  'Ṭ' => 'Ṭ',
+  'ṭ' => 'ṭ',
+  'Ṯ' => 'Ṯ',
+  'ṯ' => 'ṯ',
+  'Ṱ' => 'Ṱ',
+  'ṱ' => 'ṱ',
+  'Ṳ' => 'Ṳ',
+  'ṳ' => 'ṳ',
+  'Ṵ' => 'Ṵ',
+  'ṵ' => 'ṵ',
+  'Ṷ' => 'Ṷ',
+  'ṷ' => 'ṷ',
+  'Ṹ' => 'Ṹ',
+  'ṹ' => 'ṹ',
+  'Ṻ' => 'Ṻ',
+  'ṻ' => 'ṻ',
+  'Ṽ' => 'Ṽ',
+  'ṽ' => 'ṽ',
+  'Ṿ' => 'Ṿ',
+  'ṿ' => 'ṿ',
+  'Ẁ' => 'Ẁ',
+  'ẁ' => 'ẁ',
+  'Ẃ' => 'Ẃ',
+  'ẃ' => 'ẃ',
+  'Ẅ' => 'Ẅ',
+  'ẅ' => 'ẅ',
+  'Ẇ' => 'Ẇ',
+  'ẇ' => 'ẇ',
+  'Ẉ' => 'Ẉ',
+  'ẉ' => 'ẉ',
+  'Ẋ' => 'Ẋ',
+  'ẋ' => 'ẋ',
+  'Ẍ' => 'Ẍ',
+  'ẍ' => 'ẍ',
+  'Ẏ' => 'Ẏ',
+  'ẏ' => 'ẏ',
+  'Ẑ' => 'Ẑ',
+  'ẑ' => 'ẑ',
+  'Ẓ' => 'Ẓ',
+  'ẓ' => 'ẓ',
+  'Ẕ' => 'Ẕ',
+  'ẕ' => 'ẕ',
+  'ẖ' => 'ẖ',
+  'ẗ' => 'ẗ',
+  'ẘ' => 'ẘ',
+  'ẙ' => 'ẙ',
+  'ẛ' => 'ẛ',
+  'Ạ' => 'Ạ',
+  'ạ' => 'ạ',
+  'Ả' => 'Ả',
+  'ả' => 'ả',
+  'Ấ' => 'Ấ',
+  'ấ' => 'ấ',
+  'Ầ' => 'Ầ',
+  'ầ' => 'ầ',
+  'Ẩ' => 'Ẩ',
+  'ẩ' => 'ẩ',
+  'Ẫ' => 'Ẫ',
+  'ẫ' => 'ẫ',
+  'Ậ' => 'Ậ',
+  'ậ' => 'ậ',
+  'Ắ' => 'Ắ',
+  'ắ' => 'ắ',
+  'Ằ' => 'Ằ',
+  'ằ' => 'ằ',
+  'Ẳ' => 'Ẳ',
+  'ẳ' => 'ẳ',
+  'Ẵ' => 'Ẵ',
+  'ẵ' => 'ẵ',
+  'Ặ' => 'Ặ',
+  'ặ' => 'ặ',
+  'Ẹ' => 'Ẹ',
+  'ẹ' => 'ẹ',
+  'Ẻ' => 'Ẻ',
+  'ẻ' => 'ẻ',
+  'Ẽ' => 'Ẽ',
+  'ẽ' => 'ẽ',
+  'Ế' => 'Ế',
+  'ế' => 'ế',
+  'Ề' => 'Ề',
+  'ề' => 'ề',
+  'Ể' => 'Ể',
+  'ể' => 'ể',
+  'Ễ' => 'Ễ',
+  'ễ' => 'ễ',
+  'Ệ' => 'Ệ',
+  'ệ' => 'ệ',
+  'Ỉ' => 'Ỉ',
+  'ỉ' => 'ỉ',
+  'Ị' => 'Ị',
+  'ị' => 'ị',
+  'Ọ' => 'Ọ',
+  'ọ' => 'ọ',
+  'Ỏ' => 'Ỏ',
+  'ỏ' => 'ỏ',
+  'Ố' => 'Ố',
+  'ố' => 'ố',
+  'Ồ' => 'Ồ',
+  'ồ' => 'ồ',
+  'Ổ' => 'Ổ',
+  'ổ' => 'ổ',
+  'Ỗ' => 'Ỗ',
+  'ỗ' => 'ỗ',
+  'Ộ' => 'Ộ',
+  'ộ' => 'ộ',
+  'Ớ' => 'Ớ',
+  'ớ' => 'ớ',
+  'Ờ' => 'Ờ',
+  'ờ' => 'ờ',
+  'Ở' => 'Ở',
+  'ở' => 'ở',
+  'Ỡ' => 'Ỡ',
+  'ỡ' => 'ỡ',
+  'Ợ' => 'Ợ',
+  'ợ' => 'ợ',
+  'Ụ' => 'Ụ',
+  'ụ' => 'ụ',
+  'Ủ' => 'Ủ',
+  'ủ' => 'ủ',
+  'Ứ' => 'Ứ',
+  'ứ' => 'ứ',
+  'Ừ' => 'Ừ',
+  'ừ' => 'ừ',
+  'Ử' => 'Ử',
+  'ử' => 'ử',
+  'Ữ' => 'Ữ',
+  'ữ' => 'ữ',
+  'Ự' => 'Ự',
+  'ự' => 'ự',
+  'Ỳ' => 'Ỳ',
+  'ỳ' => 'ỳ',
+  'Ỵ' => 'Ỵ',
+  'ỵ' => 'ỵ',
+  'Ỷ' => 'Ỷ',
+  'ỷ' => 'ỷ',
+  'Ỹ' => 'Ỹ',
+  'ỹ' => 'ỹ',
+  'ἀ' => 'ἀ',
+  'ἁ' => 'ἁ',
+  'ἂ' => 'ἂ',
+  'ἃ' => 'ἃ',
+  'ἄ' => 'ἄ',
+  'ἅ' => 'ἅ',
+  'ἆ' => 'ἆ',
+  'ἇ' => 'ἇ',
+  'Ἀ' => 'Ἀ',
+  'Ἁ' => 'Ἁ',
+  'Ἂ' => 'Ἂ',
+  'Ἃ' => 'Ἃ',
+  'Ἄ' => 'Ἄ',
+  'Ἅ' => 'Ἅ',
+  'Ἆ' => 'Ἆ',
+  'Ἇ' => 'Ἇ',
+  'ἐ' => 'ἐ',
+  'ἑ' => 'ἑ',
+  'ἒ' => 'ἒ',
+  'ἓ' => 'ἓ',
+  'ἔ' => 'ἔ',
+  'ἕ' => 'ἕ',
+  'Ἐ' => 'Ἐ',
+  'Ἑ' => 'Ἑ',
+  'Ἒ' => 'Ἒ',
+  'Ἓ' => 'Ἓ',
+  'Ἔ' => 'Ἔ',
+  'Ἕ' => 'Ἕ',
+  'ἠ' => 'ἠ',
+  'ἡ' => 'ἡ',
+  'ἢ' => 'ἢ',
+  'ἣ' => 'ἣ',
+  'ἤ' => 'ἤ',
+  'ἥ' => 'ἥ',
+  'ἦ' => 'ἦ',
+  'ἧ' => 'ἧ',
+  'Ἠ' => 'Ἠ',
+  'Ἡ' => 'Ἡ',
+  'Ἢ' => 'Ἢ',
+  'Ἣ' => 'Ἣ',
+  'Ἤ' => 'Ἤ',
+  'Ἥ' => 'Ἥ',
+  'Ἦ' => 'Ἦ',
+  'Ἧ' => 'Ἧ',
+  'ἰ' => 'ἰ',
+  'ἱ' => 'ἱ',
+  'ἲ' => 'ἲ',
+  'ἳ' => 'ἳ',
+  'ἴ' => 'ἴ',
+  'ἵ' => 'ἵ',
+  'ἶ' => 'ἶ',
+  'ἷ' => 'ἷ',
+  'Ἰ' => 'Ἰ',
+  'Ἱ' => 'Ἱ',
+  'Ἲ' => 'Ἲ',
+  'Ἳ' => 'Ἳ',
+  'Ἴ' => 'Ἴ',
+  'Ἵ' => 'Ἵ',
+  'Ἶ' => 'Ἶ',
+  'Ἷ' => 'Ἷ',
+  'ὀ' => 'ὀ',
+  'ὁ' => 'ὁ',
+  'ὂ' => 'ὂ',
+  'ὃ' => 'ὃ',
+  'ὄ' => 'ὄ',
+  'ὅ' => 'ὅ',
+  'Ὀ' => 'Ὀ',
+  'Ὁ' => 'Ὁ',
+  'Ὂ' => 'Ὂ',
+  'Ὃ' => 'Ὃ',
+  'Ὄ' => 'Ὄ',
+  'Ὅ' => 'Ὅ',
+  'ὐ' => 'ὐ',
+  'ὑ' => 'ὑ',
+  'ὒ' => 'ὒ',
+  'ὓ' => 'ὓ',
+  'ὔ' => 'ὔ',
+  'ὕ' => 'ὕ',
+  'ὖ' => 'ὖ',
+  'ὗ' => 'ὗ',
+  'Ὑ' => 'Ὑ',
+  'Ὓ' => 'Ὓ',
+  'Ὕ' => 'Ὕ',
+  'Ὗ' => 'Ὗ',
+  'ὠ' => 'ὠ',
+  'ὡ' => 'ὡ',
+  'ὢ' => 'ὢ',
+  'ὣ' => 'ὣ',
+  'ὤ' => 'ὤ',
+  'ὥ' => 'ὥ',
+  'ὦ' => 'ὦ',
+  'ὧ' => 'ὧ',
+  'Ὠ' => 'Ὠ',
+  'Ὡ' => 'Ὡ',
+  'Ὢ' => 'Ὢ',
+  'Ὣ' => 'Ὣ',
+  'Ὤ' => 'Ὤ',
+  'Ὥ' => 'Ὥ',
+  'Ὦ' => 'Ὦ',
+  'Ὧ' => 'Ὧ',
+  'ὰ' => 'ὰ',
+  'ὲ' => 'ὲ',
+  'ὴ' => 'ὴ',
+  'ὶ' => 'ὶ',
+  'ὸ' => 'ὸ',
+  'ὺ' => 'ὺ',
+  'ὼ' => 'ὼ',
+  'ᾀ' => 'ᾀ',
+  'ᾁ' => 'ᾁ',
+  'ᾂ' => 'ᾂ',
+  'ᾃ' => 'ᾃ',
+  'ᾄ' => 'ᾄ',
+  'ᾅ' => 'ᾅ',
+  'ᾆ' => 'ᾆ',
+  'ᾇ' => 'ᾇ',
+  'ᾈ' => 'ᾈ',
+  'ᾉ' => 'ᾉ',
+  'ᾊ' => 'ᾊ',
+  'ᾋ' => 'ᾋ',
+  'ᾌ' => 'ᾌ',
+  'ᾍ' => 'ᾍ',
+  'ᾎ' => 'ᾎ',
+  'ᾏ' => 'ᾏ',
+  'ᾐ' => 'ᾐ',
+  'ᾑ' => 'ᾑ',
+  'ᾒ' => 'ᾒ',
+  'ᾓ' => 'ᾓ',
+  'ᾔ' => 'ᾔ',
+  'ᾕ' => 'ᾕ',
+  'ᾖ' => 'ᾖ',
+  'ᾗ' => 'ᾗ',
+  'ᾘ' => 'ᾘ',
+  'ᾙ' => 'ᾙ',
+  'ᾚ' => 'ᾚ',
+  'ᾛ' => 'ᾛ',
+  'ᾜ' => 'ᾜ',
+  'ᾝ' => 'ᾝ',
+  'ᾞ' => 'ᾞ',
+  'ᾟ' => 'ᾟ',
+  'ᾠ' => 'ᾠ',
+  'ᾡ' => 'ᾡ',
+  'ᾢ' => 'ᾢ',
+  'ᾣ' => 'ᾣ',
+  'ᾤ' => 'ᾤ',
+  'ᾥ' => 'ᾥ',
+  'ᾦ' => 'ᾦ',
+  'ᾧ' => 'ᾧ',
+  'ᾨ' => 'ᾨ',
+  'ᾩ' => 'ᾩ',
+  'ᾪ' => 'ᾪ',
+  'ᾫ' => 'ᾫ',
+  'ᾬ' => 'ᾬ',
+  'ᾭ' => 'ᾭ',
+  'ᾮ' => 'ᾮ',
+  'ᾯ' => 'ᾯ',
+  'ᾰ' => 'ᾰ',
+  'ᾱ' => 'ᾱ',
+  'ᾲ' => 'ᾲ',
+  'ᾳ' => 'ᾳ',
+  'ᾴ' => 'ᾴ',
+  'ᾶ' => 'ᾶ',
+  'ᾷ' => 'ᾷ',
+  'Ᾰ' => 'Ᾰ',
+  'Ᾱ' => 'Ᾱ',
+  'Ὰ' => 'Ὰ',
+  'ᾼ' => 'ᾼ',
+  '῁' => '῁',
+  'ῂ' => 'ῂ',
+  'ῃ' => 'ῃ',
+  'ῄ' => 'ῄ',
+  'ῆ' => 'ῆ',
+  'ῇ' => 'ῇ',
+  'Ὲ' => 'Ὲ',
+  'Ὴ' => 'Ὴ',
+  'ῌ' => 'ῌ',
+  '῍' => '῍',
+  '῎' => '῎',
+  '῏' => '῏',
+  'ῐ' => 'ῐ',
+  'ῑ' => 'ῑ',
+  'ῒ' => 'ῒ',
+  'ῖ' => 'ῖ',
+  'ῗ' => 'ῗ',
+  'Ῐ' => 'Ῐ',
+  'Ῑ' => 'Ῑ',
+  'Ὶ' => 'Ὶ',
+  '῝' => '῝',
+  '῞' => '῞',
+  '῟' => '῟',
+  'ῠ' => 'ῠ',
+  'ῡ' => 'ῡ',
+  'ῢ' => 'ῢ',
+  'ῤ' => 'ῤ',
+  'ῥ' => 'ῥ',
+  'ῦ' => 'ῦ',
+  'ῧ' => 'ῧ',
+  'Ῠ' => 'Ῠ',
+  'Ῡ' => 'Ῡ',
+  'Ὺ' => 'Ὺ',
+  'Ῥ' => 'Ῥ',
+  '῭' => '῭',
+  'ῲ' => 'ῲ',
+  'ῳ' => 'ῳ',
+  'ῴ' => 'ῴ',
+  'ῶ' => 'ῶ',
+  'ῷ' => 'ῷ',
+  'Ὸ' => 'Ὸ',
+  'Ὼ' => 'Ὼ',
+  'ῼ' => 'ῼ',
+  '↚' => '↚',
+  '↛' => '↛',
+  '↮' => '↮',
+  '⇍' => '⇍',
+  '⇎' => '⇎',
+  '⇏' => '⇏',
+  '∄' => '∄',
+  '∉' => '∉',
+  '∌' => '∌',
+  '∤' => '∤',
+  '∦' => '∦',
+  '≁' => '≁',
+  '≄' => '≄',
+  '≇' => '≇',
+  '≉' => '≉',
+  '≠' => '≠',
+  '≢' => '≢',
+  '≭' => '≭',
+  '≮' => '≮',
+  '≯' => '≯',
+  '≰' => '≰',
+  '≱' => '≱',
+  '≴' => '≴',
+  '≵' => '≵',
+  '≸' => '≸',
+  '≹' => '≹',
+  '⊀' => '⊀',
+  '⊁' => '⊁',
+  '⊄' => '⊄',
+  '⊅' => '⊅',
+  '⊈' => '⊈',
+  '⊉' => '⊉',
+  '⊬' => '⊬',
+  '⊭' => '⊭',
+  '⊮' => '⊮',
+  '⊯' => '⊯',
+  '⋠' => '⋠',
+  '⋡' => '⋡',
+  '⋢' => '⋢',
+  '⋣' => '⋣',
+  '⋪' => '⋪',
+  '⋫' => '⋫',
+  '⋬' => '⋬',
+  '⋭' => '⋭',
+  'が' => 'が',
+  'ぎ' => 'ぎ',
+  'ぐ' => 'ぐ',
+  'げ' => 'げ',
+  'ご' => 'ご',
+  'ざ' => 'ざ',
+  'じ' => 'じ',
+  'ず' => 'ず',
+  'ぜ' => 'ぜ',
+  'ぞ' => 'ぞ',
+  'だ' => 'だ',
+  'ぢ' => 'ぢ',
+  'づ' => 'づ',
+  'で' => 'で',
+  'ど' => 'ど',
+  'ば' => 'ば',
+  'ぱ' => 'ぱ',
+  'び' => 'び',
+  'ぴ' => 'ぴ',
+  'ぶ' => 'ぶ',
+  'ぷ' => 'ぷ',
+  'べ' => 'べ',
+  'ぺ' => 'ぺ',
+  'ぼ' => 'ぼ',
+  'ぽ' => 'ぽ',
+  'ゔ' => 'ゔ',
+  'ゞ' => 'ゞ',
+  'ガ' => 'ガ',
+  'ギ' => 'ギ',
+  'グ' => 'グ',
+  'ゲ' => 'ゲ',
+  'ゴ' => 'ゴ',
+  'ザ' => 'ザ',
+  'ジ' => 'ジ',
+  'ズ' => 'ズ',
+  'ゼ' => 'ゼ',
+  'ゾ' => 'ゾ',
+  'ダ' => 'ダ',
+  'ヂ' => 'ヂ',
+  'ヅ' => 'ヅ',
+  'デ' => 'デ',
+  'ド' => 'ド',
+  'バ' => 'バ',
+  'パ' => 'パ',
+  'ビ' => 'ビ',
+  'ピ' => 'ピ',
+  'ブ' => 'ブ',
+  'プ' => 'プ',
+  'ベ' => 'ベ',
+  'ペ' => 'ペ',
+  'ボ' => 'ボ',
+  'ポ' => 'ポ',
+  'ヴ' => 'ヴ',
+  'ヷ' => 'ヷ',
+  'ヸ' => 'ヸ',
+  'ヹ' => 'ヹ',
+  'ヺ' => 'ヺ',
+  'ヾ' => 'ヾ',
+  '𑂚' => '𑂚',
+  '𑂜' => '𑂜',
+  '𑂫' => '𑂫',
+  '𑄮' => '𑄮',
+  '𑄯' => '𑄯',
+  '𑍋' => '𑍋',
+  '𑍌' => '𑍌',
+  '𑒻' => '𑒻',
+  '𑒼' => '𑒼',
+  '𑒾' => '𑒾',
+  '𑖺' => '𑖺',
+  '𑖻' => '𑖻',
+  '𑤸' => '𑤸',
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php
new file mode 100644
index 000000000..5a3e8e096
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php
@@ -0,0 +1,2065 @@
+<?php
+
+return array (
+  'À' => 'À',
+  'Á' => 'Á',
+  'Â' => 'Â',
+  'Ã' => 'Ã',
+  'Ä' => 'Ä',
+  'Å' => 'Å',
+  'Ç' => 'Ç',
+  'È' => 'È',
+  'É' => 'É',
+  'Ê' => 'Ê',
+  'Ë' => 'Ë',
+  'Ì' => 'Ì',
+  'Í' => 'Í',
+  'Î' => 'Î',
+  'Ï' => 'Ï',
+  'Ñ' => 'Ñ',
+  'Ò' => 'Ò',
+  'Ó' => 'Ó',
+  'Ô' => 'Ô',
+  'Õ' => 'Õ',
+  'Ö' => 'Ö',
+  'Ù' => 'Ù',
+  'Ú' => 'Ú',
+  'Û' => 'Û',
+  'Ü' => 'Ü',
+  'Ý' => 'Ý',
+  'à' => 'à',
+  'á' => 'á',
+  'â' => 'â',
+  'ã' => 'ã',
+  'ä' => 'ä',
+  'å' => 'å',
+  'ç' => 'ç',
+  'è' => 'è',
+  'é' => 'é',
+  'ê' => 'ê',
+  'ë' => 'ë',
+  'ì' => 'ì',
+  'í' => 'í',
+  'î' => 'î',
+  'ï' => 'ï',
+  'ñ' => 'ñ',
+  'ò' => 'ò',
+  'ó' => 'ó',
+  'ô' => 'ô',
+  'õ' => 'õ',
+  'ö' => 'ö',
+  'ù' => 'ù',
+  'ú' => 'ú',
+  'û' => 'û',
+  'ü' => 'ü',
+  'ý' => 'ý',
+  'ÿ' => 'ÿ',
+  'Ā' => 'Ā',
+  'ā' => 'ā',
+  'Ă' => 'Ă',
+  'ă' => 'ă',
+  'Ą' => 'Ą',
+  'ą' => 'ą',
+  'Ć' => 'Ć',
+  'ć' => 'ć',
+  'Ĉ' => 'Ĉ',
+  'ĉ' => 'ĉ',
+  'Ċ' => 'Ċ',
+  'ċ' => 'ċ',
+  'Č' => 'Č',
+  'č' => 'č',
+  'Ď' => 'Ď',
+  'ď' => 'ď',
+  'Ē' => 'Ē',
+  'ē' => 'ē',
+  'Ĕ' => 'Ĕ',
+  'ĕ' => 'ĕ',
+  'Ė' => 'Ė',
+  'ė' => 'ė',
+  'Ę' => 'Ę',
+  'ę' => 'ę',
+  'Ě' => 'Ě',
+  'ě' => 'ě',
+  'Ĝ' => 'Ĝ',
+  'ĝ' => 'ĝ',
+  'Ğ' => 'Ğ',
+  'ğ' => 'ğ',
+  'Ġ' => 'Ġ',
+  'ġ' => 'ġ',
+  'Ģ' => 'Ģ',
+  'ģ' => 'ģ',
+  'Ĥ' => 'Ĥ',
+  'ĥ' => 'ĥ',
+  'Ĩ' => 'Ĩ',
+  'ĩ' => 'ĩ',
+  'Ī' => 'Ī',
+  'ī' => 'ī',
+  'Ĭ' => 'Ĭ',
+  'ĭ' => 'ĭ',
+  'Į' => 'Į',
+  'į' => 'į',
+  'İ' => 'İ',
+  'Ĵ' => 'Ĵ',
+  'ĵ' => 'ĵ',
+  'Ķ' => 'Ķ',
+  'ķ' => 'ķ',
+  'Ĺ' => 'Ĺ',
+  'ĺ' => 'ĺ',
+  'Ļ' => 'Ļ',
+  'ļ' => 'ļ',
+  'Ľ' => 'Ľ',
+  'ľ' => 'ľ',
+  'Ń' => 'Ń',
+  'ń' => 'ń',
+  'Ņ' => 'Ņ',
+  'ņ' => 'ņ',
+  'Ň' => 'Ň',
+  'ň' => 'ň',
+  'Ō' => 'Ō',
+  'ō' => 'ō',
+  'Ŏ' => 'Ŏ',
+  'ŏ' => 'ŏ',
+  'Ő' => 'Ő',
+  'ő' => 'ő',
+  'Ŕ' => 'Ŕ',
+  'ŕ' => 'ŕ',
+  'Ŗ' => 'Ŗ',
+  'ŗ' => 'ŗ',
+  'Ř' => 'Ř',
+  'ř' => 'ř',
+  'Ś' => 'Ś',
+  'ś' => 'ś',
+  'Ŝ' => 'Ŝ',
+  'ŝ' => 'ŝ',
+  'Ş' => 'Ş',
+  'ş' => 'ş',
+  'Š' => 'Š',
+  'š' => 'š',
+  'Ţ' => 'Ţ',
+  'ţ' => 'ţ',
+  'Ť' => 'Ť',
+  'ť' => 'ť',
+  'Ũ' => 'Ũ',
+  'ũ' => 'ũ',
+  'Ū' => 'Ū',
+  'ū' => 'ū',
+  'Ŭ' => 'Ŭ',
+  'ŭ' => 'ŭ',
+  'Ů' => 'Ů',
+  'ů' => 'ů',
+  'Ű' => 'Ű',
+  'ű' => 'ű',
+  'Ų' => 'Ų',
+  'ų' => 'ų',
+  'Ŵ' => 'Ŵ',
+  'ŵ' => 'ŵ',
+  'Ŷ' => 'Ŷ',
+  'ŷ' => 'ŷ',
+  'Ÿ' => 'Ÿ',
+  'Ź' => 'Ź',
+  'ź' => 'ź',
+  'Ż' => 'Ż',
+  'ż' => 'ż',
+  'Ž' => 'Ž',
+  'ž' => 'ž',
+  'Ơ' => 'Ơ',
+  'ơ' => 'ơ',
+  'Ư' => 'Ư',
+  'ư' => 'ư',
+  'Ǎ' => 'Ǎ',
+  'ǎ' => 'ǎ',
+  'Ǐ' => 'Ǐ',
+  'ǐ' => 'ǐ',
+  'Ǒ' => 'Ǒ',
+  'ǒ' => 'ǒ',
+  'Ǔ' => 'Ǔ',
+  'ǔ' => 'ǔ',
+  'Ǖ' => 'Ǖ',
+  'ǖ' => 'ǖ',
+  'Ǘ' => 'Ǘ',
+  'ǘ' => 'ǘ',
+  'Ǚ' => 'Ǚ',
+  'ǚ' => 'ǚ',
+  'Ǜ' => 'Ǜ',
+  'ǜ' => 'ǜ',
+  'Ǟ' => 'Ǟ',
+  'ǟ' => 'ǟ',
+  'Ǡ' => 'Ǡ',
+  'ǡ' => 'ǡ',
+  'Ǣ' => 'Ǣ',
+  'ǣ' => 'ǣ',
+  'Ǧ' => 'Ǧ',
+  'ǧ' => 'ǧ',
+  'Ǩ' => 'Ǩ',
+  'ǩ' => 'ǩ',
+  'Ǫ' => 'Ǫ',
+  'ǫ' => 'ǫ',
+  'Ǭ' => 'Ǭ',
+  'ǭ' => 'ǭ',
+  'Ǯ' => 'Ǯ',
+  'ǯ' => 'ǯ',
+  'ǰ' => 'ǰ',
+  'Ǵ' => 'Ǵ',
+  'ǵ' => 'ǵ',
+  'Ǹ' => 'Ǹ',
+  'ǹ' => 'ǹ',
+  'Ǻ' => 'Ǻ',
+  'ǻ' => 'ǻ',
+  'Ǽ' => 'Ǽ',
+  'ǽ' => 'ǽ',
+  'Ǿ' => 'Ǿ',
+  'ǿ' => 'ǿ',
+  'Ȁ' => 'Ȁ',
+  'ȁ' => 'ȁ',
+  'Ȃ' => 'Ȃ',
+  'ȃ' => 'ȃ',
+  'Ȅ' => 'Ȅ',
+  'ȅ' => 'ȅ',
+  'Ȇ' => 'Ȇ',
+  'ȇ' => 'ȇ',
+  'Ȉ' => 'Ȉ',
+  'ȉ' => 'ȉ',
+  'Ȋ' => 'Ȋ',
+  'ȋ' => 'ȋ',
+  'Ȍ' => 'Ȍ',
+  'ȍ' => 'ȍ',
+  'Ȏ' => 'Ȏ',
+  'ȏ' => 'ȏ',
+  'Ȑ' => 'Ȑ',
+  'ȑ' => 'ȑ',
+  'Ȓ' => 'Ȓ',
+  'ȓ' => 'ȓ',
+  'Ȕ' => 'Ȕ',
+  'ȕ' => 'ȕ',
+  'Ȗ' => 'Ȗ',
+  'ȗ' => 'ȗ',
+  'Ș' => 'Ș',
+  'ș' => 'ș',
+  'Ț' => 'Ț',
+  'ț' => 'ț',
+  'Ȟ' => 'Ȟ',
+  'ȟ' => 'ȟ',
+  'Ȧ' => 'Ȧ',
+  'ȧ' => 'ȧ',
+  'Ȩ' => 'Ȩ',
+  'ȩ' => 'ȩ',
+  'Ȫ' => 'Ȫ',
+  'ȫ' => 'ȫ',
+  'Ȭ' => 'Ȭ',
+  'ȭ' => 'ȭ',
+  'Ȯ' => 'Ȯ',
+  'ȯ' => 'ȯ',
+  'Ȱ' => 'Ȱ',
+  'ȱ' => 'ȱ',
+  'Ȳ' => 'Ȳ',
+  'ȳ' => 'ȳ',
+  '̀' => '̀',
+  '́' => '́',
+  '̓' => '̓',
+  '̈́' => '̈́',
+  'ʹ' => 'ʹ',
+  ';' => ';',
+  '΅' => '΅',
+  'Ά' => 'Ά',
+  '·' => '·',
+  'Έ' => 'Έ',
+  'Ή' => 'Ή',
+  'Ί' => 'Ί',
+  'Ό' => 'Ό',
+  'Ύ' => 'Ύ',
+  'Ώ' => 'Ώ',
+  'ΐ' => 'ΐ',
+  'Ϊ' => 'Ϊ',
+  'Ϋ' => 'Ϋ',
+  'ά' => 'ά',
+  'έ' => 'έ',
+  'ή' => 'ή',
+  'ί' => 'ί',
+  'ΰ' => 'ΰ',
+  'ϊ' => 'ϊ',
+  'ϋ' => 'ϋ',
+  'ό' => 'ό',
+  'ύ' => 'ύ',
+  'ώ' => 'ώ',
+  'ϓ' => 'ϓ',
+  'ϔ' => 'ϔ',
+  'Ѐ' => 'Ѐ',
+  'Ё' => 'Ё',
+  'Ѓ' => 'Ѓ',
+  'Ї' => 'Ї',
+  'Ќ' => 'Ќ',
+  'Ѝ' => 'Ѝ',
+  'Ў' => 'Ў',
+  'Й' => 'Й',
+  'й' => 'й',
+  'ѐ' => 'ѐ',
+  'ё' => 'ё',
+  'ѓ' => 'ѓ',
+  'ї' => 'ї',
+  'ќ' => 'ќ',
+  'ѝ' => 'ѝ',
+  'ў' => 'ў',
+  'Ѷ' => 'Ѷ',
+  'ѷ' => 'ѷ',
+  'Ӂ' => 'Ӂ',
+  'ӂ' => 'ӂ',
+  'Ӑ' => 'Ӑ',
+  'ӑ' => 'ӑ',
+  'Ӓ' => 'Ӓ',
+  'ӓ' => 'ӓ',
+  'Ӗ' => 'Ӗ',
+  'ӗ' => 'ӗ',
+  'Ӛ' => 'Ӛ',
+  'ӛ' => 'ӛ',
+  'Ӝ' => 'Ӝ',
+  'ӝ' => 'ӝ',
+  'Ӟ' => 'Ӟ',
+  'ӟ' => 'ӟ',
+  'Ӣ' => 'Ӣ',
+  'ӣ' => 'ӣ',
+  'Ӥ' => 'Ӥ',
+  'ӥ' => 'ӥ',
+  'Ӧ' => 'Ӧ',
+  'ӧ' => 'ӧ',
+  'Ӫ' => 'Ӫ',
+  'ӫ' => 'ӫ',
+  'Ӭ' => 'Ӭ',
+  'ӭ' => 'ӭ',
+  'Ӯ' => 'Ӯ',
+  'ӯ' => 'ӯ',
+  'Ӱ' => 'Ӱ',
+  'ӱ' => 'ӱ',
+  'Ӳ' => 'Ӳ',
+  'ӳ' => 'ӳ',
+  'Ӵ' => 'Ӵ',
+  'ӵ' => 'ӵ',
+  'Ӹ' => 'Ӹ',
+  'ӹ' => 'ӹ',
+  'آ' => 'آ',
+  'أ' => 'أ',
+  'ؤ' => 'ؤ',
+  'إ' => 'إ',
+  'ئ' => 'ئ',
+  'ۀ' => 'ۀ',
+  'ۂ' => 'ۂ',
+  'ۓ' => 'ۓ',
+  'ऩ' => 'ऩ',
+  'ऱ' => 'ऱ',
+  'ऴ' => 'ऴ',
+  'क़' => 'क़',
+  'ख़' => 'ख़',
+  'ग़' => 'ग़',
+  'ज़' => 'ज़',
+  'ड़' => 'ड़',
+  'ढ़' => 'ढ़',
+  'फ़' => 'फ़',
+  'य़' => 'य़',
+  'ো' => 'ো',
+  'ৌ' => 'ৌ',
+  'ড়' => 'ড়',
+  'ঢ়' => 'ঢ়',
+  'য়' => 'য়',
+  'ਲ਼' => 'ਲ਼',
+  'ਸ਼' => 'ਸ਼',
+  'ਖ਼' => 'ਖ਼',
+  'ਗ਼' => 'ਗ਼',
+  'ਜ਼' => 'ਜ਼',
+  'ਫ਼' => 'ਫ਼',
+  'ୈ' => 'ୈ',
+  'ୋ' => 'ୋ',
+  'ୌ' => 'ୌ',
+  'ଡ଼' => 'ଡ଼',
+  'ଢ଼' => 'ଢ଼',
+  'ஔ' => 'ஔ',
+  'ொ' => 'ொ',
+  'ோ' => 'ோ',
+  'ௌ' => 'ௌ',
+  'ై' => 'ై',
+  'ೀ' => 'ೀ',
+  'ೇ' => 'ೇ',
+  'ೈ' => 'ೈ',
+  'ೊ' => 'ೊ',
+  'ೋ' => 'ೋ',
+  'ൊ' => 'ൊ',
+  'ോ' => 'ോ',
+  'ൌ' => 'ൌ',
+  'ේ' => 'ේ',
+  'ො' => 'ො',
+  'ෝ' => 'ෝ',
+  'ෞ' => 'ෞ',
+  'གྷ' => 'གྷ',
+  'ཌྷ' => 'ཌྷ',
+  'དྷ' => 'དྷ',
+  'བྷ' => 'བྷ',
+  'ཛྷ' => 'ཛྷ',
+  'ཀྵ' => 'ཀྵ',
+  'ཱི' => 'ཱི',
+  'ཱུ' => 'ཱུ',
+  'ྲྀ' => 'ྲྀ',
+  'ླྀ' => 'ླྀ',
+  'ཱྀ' => 'ཱྀ',
+  'ྒྷ' => 'ྒྷ',
+  'ྜྷ' => 'ྜྷ',
+  'ྡྷ' => 'ྡྷ',
+  'ྦྷ' => 'ྦྷ',
+  'ྫྷ' => 'ྫྷ',
+  'ྐྵ' => 'ྐྵ',
+  'ဦ' => 'ဦ',
+  'ᬆ' => 'ᬆ',
+  'ᬈ' => 'ᬈ',
+  'ᬊ' => 'ᬊ',
+  'ᬌ' => 'ᬌ',
+  'ᬎ' => 'ᬎ',
+  'ᬒ' => 'ᬒ',
+  'ᬻ' => 'ᬻ',
+  'ᬽ' => 'ᬽ',
+  'ᭀ' => 'ᭀ',
+  'ᭁ' => 'ᭁ',
+  'ᭃ' => 'ᭃ',
+  'Ḁ' => 'Ḁ',
+  'ḁ' => 'ḁ',
+  'Ḃ' => 'Ḃ',
+  'ḃ' => 'ḃ',
+  'Ḅ' => 'Ḅ',
+  'ḅ' => 'ḅ',
+  'Ḇ' => 'Ḇ',
+  'ḇ' => 'ḇ',
+  'Ḉ' => 'Ḉ',
+  'ḉ' => 'ḉ',
+  'Ḋ' => 'Ḋ',
+  'ḋ' => 'ḋ',
+  'Ḍ' => 'Ḍ',
+  'ḍ' => 'ḍ',
+  'Ḏ' => 'Ḏ',
+  'ḏ' => 'ḏ',
+  'Ḑ' => 'Ḑ',
+  'ḑ' => 'ḑ',
+  'Ḓ' => 'Ḓ',
+  'ḓ' => 'ḓ',
+  'Ḕ' => 'Ḕ',
+  'ḕ' => 'ḕ',
+  'Ḗ' => 'Ḗ',
+  'ḗ' => 'ḗ',
+  'Ḙ' => 'Ḙ',
+  'ḙ' => 'ḙ',
+  'Ḛ' => 'Ḛ',
+  'ḛ' => 'ḛ',
+  'Ḝ' => 'Ḝ',
+  'ḝ' => 'ḝ',
+  'Ḟ' => 'Ḟ',
+  'ḟ' => 'ḟ',
+  'Ḡ' => 'Ḡ',
+  'ḡ' => 'ḡ',
+  'Ḣ' => 'Ḣ',
+  'ḣ' => 'ḣ',
+  'Ḥ' => 'Ḥ',
+  'ḥ' => 'ḥ',
+  'Ḧ' => 'Ḧ',
+  'ḧ' => 'ḧ',
+  'Ḩ' => 'Ḩ',
+  'ḩ' => 'ḩ',
+  'Ḫ' => 'Ḫ',
+  'ḫ' => 'ḫ',
+  'Ḭ' => 'Ḭ',
+  'ḭ' => 'ḭ',
+  'Ḯ' => 'Ḯ',
+  'ḯ' => 'ḯ',
+  'Ḱ' => 'Ḱ',
+  'ḱ' => 'ḱ',
+  'Ḳ' => 'Ḳ',
+  'ḳ' => 'ḳ',
+  'Ḵ' => 'Ḵ',
+  'ḵ' => 'ḵ',
+  'Ḷ' => 'Ḷ',
+  'ḷ' => 'ḷ',
+  'Ḹ' => 'Ḹ',
+  'ḹ' => 'ḹ',
+  'Ḻ' => 'Ḻ',
+  'ḻ' => 'ḻ',
+  'Ḽ' => 'Ḽ',
+  'ḽ' => 'ḽ',
+  'Ḿ' => 'Ḿ',
+  'ḿ' => 'ḿ',
+  'Ṁ' => 'Ṁ',
+  'ṁ' => 'ṁ',
+  'Ṃ' => 'Ṃ',
+  'ṃ' => 'ṃ',
+  'Ṅ' => 'Ṅ',
+  'ṅ' => 'ṅ',
+  'Ṇ' => 'Ṇ',
+  'ṇ' => 'ṇ',
+  'Ṉ' => 'Ṉ',
+  'ṉ' => 'ṉ',
+  'Ṋ' => 'Ṋ',
+  'ṋ' => 'ṋ',
+  'Ṍ' => 'Ṍ',
+  'ṍ' => 'ṍ',
+  'Ṏ' => 'Ṏ',
+  'ṏ' => 'ṏ',
+  'Ṑ' => 'Ṑ',
+  'ṑ' => 'ṑ',
+  'Ṓ' => 'Ṓ',
+  'ṓ' => 'ṓ',
+  'Ṕ' => 'Ṕ',
+  'ṕ' => 'ṕ',
+  'Ṗ' => 'Ṗ',
+  'ṗ' => 'ṗ',
+  'Ṙ' => 'Ṙ',
+  'ṙ' => 'ṙ',
+  'Ṛ' => 'Ṛ',
+  'ṛ' => 'ṛ',
+  'Ṝ' => 'Ṝ',
+  'ṝ' => 'ṝ',
+  'Ṟ' => 'Ṟ',
+  'ṟ' => 'ṟ',
+  'Ṡ' => 'Ṡ',
+  'ṡ' => 'ṡ',
+  'Ṣ' => 'Ṣ',
+  'ṣ' => 'ṣ',
+  'Ṥ' => 'Ṥ',
+  'ṥ' => 'ṥ',
+  'Ṧ' => 'Ṧ',
+  'ṧ' => 'ṧ',
+  'Ṩ' => 'Ṩ',
+  'ṩ' => 'ṩ',
+  'Ṫ' => 'Ṫ',
+  'ṫ' => 'ṫ',
+  'Ṭ' => 'Ṭ',
+  'ṭ' => 'ṭ',
+  'Ṯ' => 'Ṯ',
+  'ṯ' => 'ṯ',
+  'Ṱ' => 'Ṱ',
+  'ṱ' => 'ṱ',
+  'Ṳ' => 'Ṳ',
+  'ṳ' => 'ṳ',
+  'Ṵ' => 'Ṵ',
+  'ṵ' => 'ṵ',
+  'Ṷ' => 'Ṷ',
+  'ṷ' => 'ṷ',
+  'Ṹ' => 'Ṹ',
+  'ṹ' => 'ṹ',
+  'Ṻ' => 'Ṻ',
+  'ṻ' => 'ṻ',
+  'Ṽ' => 'Ṽ',
+  'ṽ' => 'ṽ',
+  'Ṿ' => 'Ṿ',
+  'ṿ' => 'ṿ',
+  'Ẁ' => 'Ẁ',
+  'ẁ' => 'ẁ',
+  'Ẃ' => 'Ẃ',
+  'ẃ' => 'ẃ',
+  'Ẅ' => 'Ẅ',
+  'ẅ' => 'ẅ',
+  'Ẇ' => 'Ẇ',
+  'ẇ' => 'ẇ',
+  'Ẉ' => 'Ẉ',
+  'ẉ' => 'ẉ',
+  'Ẋ' => 'Ẋ',
+  'ẋ' => 'ẋ',
+  'Ẍ' => 'Ẍ',
+  'ẍ' => 'ẍ',
+  'Ẏ' => 'Ẏ',
+  'ẏ' => 'ẏ',
+  'Ẑ' => 'Ẑ',
+  'ẑ' => 'ẑ',
+  'Ẓ' => 'Ẓ',
+  'ẓ' => 'ẓ',
+  'Ẕ' => 'Ẕ',
+  'ẕ' => 'ẕ',
+  'ẖ' => 'ẖ',
+  'ẗ' => 'ẗ',
+  'ẘ' => 'ẘ',
+  'ẙ' => 'ẙ',
+  'ẛ' => 'ẛ',
+  'Ạ' => 'Ạ',
+  'ạ' => 'ạ',
+  'Ả' => 'Ả',
+  'ả' => 'ả',
+  'Ấ' => 'Ấ',
+  'ấ' => 'ấ',
+  'Ầ' => 'Ầ',
+  'ầ' => 'ầ',
+  'Ẩ' => 'Ẩ',
+  'ẩ' => 'ẩ',
+  'Ẫ' => 'Ẫ',
+  'ẫ' => 'ẫ',
+  'Ậ' => 'Ậ',
+  'ậ' => 'ậ',
+  'Ắ' => 'Ắ',
+  'ắ' => 'ắ',
+  'Ằ' => 'Ằ',
+  'ằ' => 'ằ',
+  'Ẳ' => 'Ẳ',
+  'ẳ' => 'ẳ',
+  'Ẵ' => 'Ẵ',
+  'ẵ' => 'ẵ',
+  'Ặ' => 'Ặ',
+  'ặ' => 'ặ',
+  'Ẹ' => 'Ẹ',
+  'ẹ' => 'ẹ',
+  'Ẻ' => 'Ẻ',
+  'ẻ' => 'ẻ',
+  'Ẽ' => 'Ẽ',
+  'ẽ' => 'ẽ',
+  'Ế' => 'Ế',
+  'ế' => 'ế',
+  'Ề' => 'Ề',
+  'ề' => 'ề',
+  'Ể' => 'Ể',
+  'ể' => 'ể',
+  'Ễ' => 'Ễ',
+  'ễ' => 'ễ',
+  'Ệ' => 'Ệ',
+  'ệ' => 'ệ',
+  'Ỉ' => 'Ỉ',
+  'ỉ' => 'ỉ',
+  'Ị' => 'Ị',
+  'ị' => 'ị',
+  'Ọ' => 'Ọ',
+  'ọ' => 'ọ',
+  'Ỏ' => 'Ỏ',
+  'ỏ' => 'ỏ',
+  'Ố' => 'Ố',
+  'ố' => 'ố',
+  'Ồ' => 'Ồ',
+  'ồ' => 'ồ',
+  'Ổ' => 'Ổ',
+  'ổ' => 'ổ',
+  'Ỗ' => 'Ỗ',
+  'ỗ' => 'ỗ',
+  'Ộ' => 'Ộ',
+  'ộ' => 'ộ',
+  'Ớ' => 'Ớ',
+  'ớ' => 'ớ',
+  'Ờ' => 'Ờ',
+  'ờ' => 'ờ',
+  'Ở' => 'Ở',
+  'ở' => 'ở',
+  'Ỡ' => 'Ỡ',
+  'ỡ' => 'ỡ',
+  'Ợ' => 'Ợ',
+  'ợ' => 'ợ',
+  'Ụ' => 'Ụ',
+  'ụ' => 'ụ',
+  'Ủ' => 'Ủ',
+  'ủ' => 'ủ',
+  'Ứ' => 'Ứ',
+  'ứ' => 'ứ',
+  'Ừ' => 'Ừ',
+  'ừ' => 'ừ',
+  'Ử' => 'Ử',
+  'ử' => 'ử',
+  'Ữ' => 'Ữ',
+  'ữ' => 'ữ',
+  'Ự' => 'Ự',
+  'ự' => 'ự',
+  'Ỳ' => 'Ỳ',
+  'ỳ' => 'ỳ',
+  'Ỵ' => 'Ỵ',
+  'ỵ' => 'ỵ',
+  'Ỷ' => 'Ỷ',
+  'ỷ' => 'ỷ',
+  'Ỹ' => 'Ỹ',
+  'ỹ' => 'ỹ',
+  'ἀ' => 'ἀ',
+  'ἁ' => 'ἁ',
+  'ἂ' => 'ἂ',
+  'ἃ' => 'ἃ',
+  'ἄ' => 'ἄ',
+  'ἅ' => 'ἅ',
+  'ἆ' => 'ἆ',
+  'ἇ' => 'ἇ',
+  'Ἀ' => 'Ἀ',
+  'Ἁ' => 'Ἁ',
+  'Ἂ' => 'Ἂ',
+  'Ἃ' => 'Ἃ',
+  'Ἄ' => 'Ἄ',
+  'Ἅ' => 'Ἅ',
+  'Ἆ' => 'Ἆ',
+  'Ἇ' => 'Ἇ',
+  'ἐ' => 'ἐ',
+  'ἑ' => 'ἑ',
+  'ἒ' => 'ἒ',
+  'ἓ' => 'ἓ',
+  'ἔ' => 'ἔ',
+  'ἕ' => 'ἕ',
+  'Ἐ' => 'Ἐ',
+  'Ἑ' => 'Ἑ',
+  'Ἒ' => 'Ἒ',
+  'Ἓ' => 'Ἓ',
+  'Ἔ' => 'Ἔ',
+  'Ἕ' => 'Ἕ',
+  'ἠ' => 'ἠ',
+  'ἡ' => 'ἡ',
+  'ἢ' => 'ἢ',
+  'ἣ' => 'ἣ',
+  'ἤ' => 'ἤ',
+  'ἥ' => 'ἥ',
+  'ἦ' => 'ἦ',
+  'ἧ' => 'ἧ',
+  'Ἠ' => 'Ἠ',
+  'Ἡ' => 'Ἡ',
+  'Ἢ' => 'Ἢ',
+  'Ἣ' => 'Ἣ',
+  'Ἤ' => 'Ἤ',
+  'Ἥ' => 'Ἥ',
+  'Ἦ' => 'Ἦ',
+  'Ἧ' => 'Ἧ',
+  'ἰ' => 'ἰ',
+  'ἱ' => 'ἱ',
+  'ἲ' => 'ἲ',
+  'ἳ' => 'ἳ',
+  'ἴ' => 'ἴ',
+  'ἵ' => 'ἵ',
+  'ἶ' => 'ἶ',
+  'ἷ' => 'ἷ',
+  'Ἰ' => 'Ἰ',
+  'Ἱ' => 'Ἱ',
+  'Ἲ' => 'Ἲ',
+  'Ἳ' => 'Ἳ',
+  'Ἴ' => 'Ἴ',
+  'Ἵ' => 'Ἵ',
+  'Ἶ' => 'Ἶ',
+  'Ἷ' => 'Ἷ',
+  'ὀ' => 'ὀ',
+  'ὁ' => 'ὁ',
+  'ὂ' => 'ὂ',
+  'ὃ' => 'ὃ',
+  'ὄ' => 'ὄ',
+  'ὅ' => 'ὅ',
+  'Ὀ' => 'Ὀ',
+  'Ὁ' => 'Ὁ',
+  'Ὂ' => 'Ὂ',
+  'Ὃ' => 'Ὃ',
+  'Ὄ' => 'Ὄ',
+  'Ὅ' => 'Ὅ',
+  'ὐ' => 'ὐ',
+  'ὑ' => 'ὑ',
+  'ὒ' => 'ὒ',
+  'ὓ' => 'ὓ',
+  'ὔ' => 'ὔ',
+  'ὕ' => 'ὕ',
+  'ὖ' => 'ὖ',
+  'ὗ' => 'ὗ',
+  'Ὑ' => 'Ὑ',
+  'Ὓ' => 'Ὓ',
+  'Ὕ' => 'Ὕ',
+  'Ὗ' => 'Ὗ',
+  'ὠ' => 'ὠ',
+  'ὡ' => 'ὡ',
+  'ὢ' => 'ὢ',
+  'ὣ' => 'ὣ',
+  'ὤ' => 'ὤ',
+  'ὥ' => 'ὥ',
+  'ὦ' => 'ὦ',
+  'ὧ' => 'ὧ',
+  'Ὠ' => 'Ὠ',
+  'Ὡ' => 'Ὡ',
+  'Ὢ' => 'Ὢ',
+  'Ὣ' => 'Ὣ',
+  'Ὤ' => 'Ὤ',
+  'Ὥ' => 'Ὥ',
+  'Ὦ' => 'Ὦ',
+  'Ὧ' => 'Ὧ',
+  'ὰ' => 'ὰ',
+  'ά' => 'ά',
+  'ὲ' => 'ὲ',
+  'έ' => 'έ',
+  'ὴ' => 'ὴ',
+  'ή' => 'ή',
+  'ὶ' => 'ὶ',
+  'ί' => 'ί',
+  'ὸ' => 'ὸ',
+  'ό' => 'ό',
+  'ὺ' => 'ὺ',
+  'ύ' => 'ύ',
+  'ὼ' => 'ὼ',
+  'ώ' => 'ώ',
+  'ᾀ' => 'ᾀ',
+  'ᾁ' => 'ᾁ',
+  'ᾂ' => 'ᾂ',
+  'ᾃ' => 'ᾃ',
+  'ᾄ' => 'ᾄ',
+  'ᾅ' => 'ᾅ',
+  'ᾆ' => 'ᾆ',
+  'ᾇ' => 'ᾇ',
+  'ᾈ' => 'ᾈ',
+  'ᾉ' => 'ᾉ',
+  'ᾊ' => 'ᾊ',
+  'ᾋ' => 'ᾋ',
+  'ᾌ' => 'ᾌ',
+  'ᾍ' => 'ᾍ',
+  'ᾎ' => 'ᾎ',
+  'ᾏ' => 'ᾏ',
+  'ᾐ' => 'ᾐ',
+  'ᾑ' => 'ᾑ',
+  'ᾒ' => 'ᾒ',
+  'ᾓ' => 'ᾓ',
+  'ᾔ' => 'ᾔ',
+  'ᾕ' => 'ᾕ',
+  'ᾖ' => 'ᾖ',
+  'ᾗ' => 'ᾗ',
+  'ᾘ' => 'ᾘ',
+  'ᾙ' => 'ᾙ',
+  'ᾚ' => 'ᾚ',
+  'ᾛ' => 'ᾛ',
+  'ᾜ' => 'ᾜ',
+  'ᾝ' => 'ᾝ',
+  'ᾞ' => 'ᾞ',
+  'ᾟ' => 'ᾟ',
+  'ᾠ' => 'ᾠ',
+  'ᾡ' => 'ᾡ',
+  'ᾢ' => 'ᾢ',
+  'ᾣ' => 'ᾣ',
+  'ᾤ' => 'ᾤ',
+  'ᾥ' => 'ᾥ',
+  'ᾦ' => 'ᾦ',
+  'ᾧ' => 'ᾧ',
+  'ᾨ' => 'ᾨ',
+  'ᾩ' => 'ᾩ',
+  'ᾪ' => 'ᾪ',
+  'ᾫ' => 'ᾫ',
+  'ᾬ' => 'ᾬ',
+  'ᾭ' => 'ᾭ',
+  'ᾮ' => 'ᾮ',
+  'ᾯ' => 'ᾯ',
+  'ᾰ' => 'ᾰ',
+  'ᾱ' => 'ᾱ',
+  'ᾲ' => 'ᾲ',
+  'ᾳ' => 'ᾳ',
+  'ᾴ' => 'ᾴ',
+  'ᾶ' => 'ᾶ',
+  'ᾷ' => 'ᾷ',
+  'Ᾰ' => 'Ᾰ',
+  'Ᾱ' => 'Ᾱ',
+  'Ὰ' => 'Ὰ',
+  'Ά' => 'Ά',
+  'ᾼ' => 'ᾼ',
+  'ι' => 'ι',
+  '῁' => '῁',
+  'ῂ' => 'ῂ',
+  'ῃ' => 'ῃ',
+  'ῄ' => 'ῄ',
+  'ῆ' => 'ῆ',
+  'ῇ' => 'ῇ',
+  'Ὲ' => 'Ὲ',
+  'Έ' => 'Έ',
+  'Ὴ' => 'Ὴ',
+  'Ή' => 'Ή',
+  'ῌ' => 'ῌ',
+  '῍' => '῍',
+  '῎' => '῎',
+  '῏' => '῏',
+  'ῐ' => 'ῐ',
+  'ῑ' => 'ῑ',
+  'ῒ' => 'ῒ',
+  'ΐ' => 'ΐ',
+  'ῖ' => 'ῖ',
+  'ῗ' => 'ῗ',
+  'Ῐ' => 'Ῐ',
+  'Ῑ' => 'Ῑ',
+  'Ὶ' => 'Ὶ',
+  'Ί' => 'Ί',
+  '῝' => '῝',
+  '῞' => '῞',
+  '῟' => '῟',
+  'ῠ' => 'ῠ',
+  'ῡ' => 'ῡ',
+  'ῢ' => 'ῢ',
+  'ΰ' => 'ΰ',
+  'ῤ' => 'ῤ',
+  'ῥ' => 'ῥ',
+  'ῦ' => 'ῦ',
+  'ῧ' => 'ῧ',
+  'Ῠ' => 'Ῠ',
+  'Ῡ' => 'Ῡ',
+  'Ὺ' => 'Ὺ',
+  'Ύ' => 'Ύ',
+  'Ῥ' => 'Ῥ',
+  '῭' => '῭',
+  '΅' => '΅',
+  '`' => '`',
+  'ῲ' => 'ῲ',
+  'ῳ' => 'ῳ',
+  'ῴ' => 'ῴ',
+  'ῶ' => 'ῶ',
+  'ῷ' => 'ῷ',
+  'Ὸ' => 'Ὸ',
+  'Ό' => 'Ό',
+  'Ὼ' => 'Ὼ',
+  'Ώ' => 'Ώ',
+  'ῼ' => 'ῼ',
+  '´' => '´',
+  ' ' => ' ',
+  ' ' => ' ',
+  'Ω' => 'Ω',
+  'K' => 'K',
+  'Å' => 'Å',
+  '↚' => '↚',
+  '↛' => '↛',
+  '↮' => '↮',
+  '⇍' => '⇍',
+  '⇎' => '⇎',
+  '⇏' => '⇏',
+  '∄' => '∄',
+  '∉' => '∉',
+  '∌' => '∌',
+  '∤' => '∤',
+  '∦' => '∦',
+  '≁' => '≁',
+  '≄' => '≄',
+  '≇' => '≇',
+  '≉' => '≉',
+  '≠' => '≠',
+  '≢' => '≢',
+  '≭' => '≭',
+  '≮' => '≮',
+  '≯' => '≯',
+  '≰' => '≰',
+  '≱' => '≱',
+  '≴' => '≴',
+  '≵' => '≵',
+  '≸' => '≸',
+  '≹' => '≹',
+  '⊀' => '⊀',
+  '⊁' => '⊁',
+  '⊄' => '⊄',
+  '⊅' => '⊅',
+  '⊈' => '⊈',
+  '⊉' => '⊉',
+  '⊬' => '⊬',
+  '⊭' => '⊭',
+  '⊮' => '⊮',
+  '⊯' => '⊯',
+  '⋠' => '⋠',
+  '⋡' => '⋡',
+  '⋢' => '⋢',
+  '⋣' => '⋣',
+  '⋪' => '⋪',
+  '⋫' => '⋫',
+  '⋬' => '⋬',
+  '⋭' => '⋭',
+  '〈' => '〈',
+  '〉' => '〉',
+  '⫝̸' => '⫝̸',
+  'が' => 'が',
+  'ぎ' => 'ぎ',
+  'ぐ' => 'ぐ',
+  'げ' => 'げ',
+  'ご' => 'ご',
+  'ざ' => 'ざ',
+  'じ' => 'じ',
+  'ず' => 'ず',
+  'ぜ' => 'ぜ',
+  'ぞ' => 'ぞ',
+  'だ' => 'だ',
+  'ぢ' => 'ぢ',
+  'づ' => 'づ',
+  'で' => 'で',
+  'ど' => 'ど',
+  'ば' => 'ば',
+  'ぱ' => 'ぱ',
+  'び' => 'び',
+  'ぴ' => 'ぴ',
+  'ぶ' => 'ぶ',
+  'ぷ' => 'ぷ',
+  'べ' => 'べ',
+  'ぺ' => 'ぺ',
+  'ぼ' => 'ぼ',
+  'ぽ' => 'ぽ',
+  'ゔ' => 'ゔ',
+  'ゞ' => 'ゞ',
+  'ガ' => 'ガ',
+  'ギ' => 'ギ',
+  'グ' => 'グ',
+  'ゲ' => 'ゲ',
+  'ゴ' => 'ゴ',
+  'ザ' => 'ザ',
+  'ジ' => 'ジ',
+  'ズ' => 'ズ',
+  'ゼ' => 'ゼ',
+  'ゾ' => 'ゾ',
+  'ダ' => 'ダ',
+  'ヂ' => 'ヂ',
+  'ヅ' => 'ヅ',
+  'デ' => 'デ',
+  'ド' => 'ド',
+  'バ' => 'バ',
+  'パ' => 'パ',
+  'ビ' => 'ビ',
+  'ピ' => 'ピ',
+  'ブ' => 'ブ',
+  'プ' => 'プ',
+  'ベ' => 'ベ',
+  'ペ' => 'ペ',
+  'ボ' => 'ボ',
+  'ポ' => 'ポ',
+  'ヴ' => 'ヴ',
+  'ヷ' => 'ヷ',
+  'ヸ' => 'ヸ',
+  'ヹ' => 'ヹ',
+  'ヺ' => 'ヺ',
+  'ヾ' => 'ヾ',
+  '豈' => '豈',
+  '更' => '更',
+  '車' => '車',
+  '賈' => '賈',
+  '滑' => '滑',
+  '串' => '串',
+  '句' => '句',
+  '龜' => '龜',
+  '龜' => '龜',
+  '契' => '契',
+  '金' => '金',
+  '喇' => '喇',
+  '奈' => '奈',
+  '懶' => '懶',
+  '癩' => '癩',
+  '羅' => '羅',
+  '蘿' => '蘿',
+  '螺' => '螺',
+  '裸' => '裸',
+  '邏' => '邏',
+  '樂' => '樂',
+  '洛' => '洛',
+  '烙' => '烙',
+  '珞' => '珞',
+  '落' => '落',
+  '酪' => '酪',
+  '駱' => '駱',
+  '亂' => '亂',
+  '卵' => '卵',
+  '欄' => '欄',
+  '爛' => '爛',
+  '蘭' => '蘭',
+  '鸞' => '鸞',
+  '嵐' => '嵐',
+  '濫' => '濫',
+  '藍' => '藍',
+  '襤' => '襤',
+  '拉' => '拉',
+  '臘' => '臘',
+  '蠟' => '蠟',
+  '廊' => '廊',
+  '朗' => '朗',
+  '浪' => '浪',
+  '狼' => '狼',
+  '郎' => '郎',
+  '來' => '來',
+  '冷' => '冷',
+  '勞' => '勞',
+  '擄' => '擄',
+  '櫓' => '櫓',
+  '爐' => '爐',
+  '盧' => '盧',
+  '老' => '老',
+  '蘆' => '蘆',
+  '虜' => '虜',
+  '路' => '路',
+  '露' => '露',
+  '魯' => '魯',
+  '鷺' => '鷺',
+  '碌' => '碌',
+  '祿' => '祿',
+  '綠' => '綠',
+  '菉' => '菉',
+  '錄' => '錄',
+  '鹿' => '鹿',
+  '論' => '論',
+  '壟' => '壟',
+  '弄' => '弄',
+  '籠' => '籠',
+  '聾' => '聾',
+  '牢' => '牢',
+  '磊' => '磊',
+  '賂' => '賂',
+  '雷' => '雷',
+  '壘' => '壘',
+  '屢' => '屢',
+  '樓' => '樓',
+  '淚' => '淚',
+  '漏' => '漏',
+  '累' => '累',
+  '縷' => '縷',
+  '陋' => '陋',
+  '勒' => '勒',
+  '肋' => '肋',
+  '凜' => '凜',
+  '凌' => '凌',
+  '稜' => '稜',
+  '綾' => '綾',
+  '菱' => '菱',
+  '陵' => '陵',
+  '讀' => '讀',
+  '拏' => '拏',
+  '樂' => '樂',
+  '諾' => '諾',
+  '丹' => '丹',
+  '寧' => '寧',
+  '怒' => '怒',
+  '率' => '率',
+  '異' => '異',
+  '北' => '北',
+  '磻' => '磻',
+  '便' => '便',
+  '復' => '復',
+  '不' => '不',
+  '泌' => '泌',
+  '數' => '數',
+  '索' => '索',
+  '參' => '參',
+  '塞' => '塞',
+  '省' => '省',
+  '葉' => '葉',
+  '說' => '說',
+  '殺' => '殺',
+  '辰' => '辰',
+  '沈' => '沈',
+  '拾' => '拾',
+  '若' => '若',
+  '掠' => '掠',
+  '略' => '略',
+  '亮' => '亮',
+  '兩' => '兩',
+  '凉' => '凉',
+  '梁' => '梁',
+  '糧' => '糧',
+  '良' => '良',
+  '諒' => '諒',
+  '量' => '量',
+  '勵' => '勵',
+  '呂' => '呂',
+  '女' => '女',
+  '廬' => '廬',
+  '旅' => '旅',
+  '濾' => '濾',
+  '礪' => '礪',
+  '閭' => '閭',
+  '驪' => '驪',
+  '麗' => '麗',
+  '黎' => '黎',
+  '力' => '力',
+  '曆' => '曆',
+  '歷' => '歷',
+  '轢' => '轢',
+  '年' => '年',
+  '憐' => '憐',
+  '戀' => '戀',
+  '撚' => '撚',
+  '漣' => '漣',
+  '煉' => '煉',
+  '璉' => '璉',
+  '秊' => '秊',
+  '練' => '練',
+  '聯' => '聯',
+  '輦' => '輦',
+  '蓮' => '蓮',
+  '連' => '連',
+  '鍊' => '鍊',
+  '列' => '列',
+  '劣' => '劣',
+  '咽' => '咽',
+  '烈' => '烈',
+  '裂' => '裂',
+  '說' => '說',
+  '廉' => '廉',
+  '念' => '念',
+  '捻' => '捻',
+  '殮' => '殮',
+  '簾' => '簾',
+  '獵' => '獵',
+  '令' => '令',
+  '囹' => '囹',
+  '寧' => '寧',
+  '嶺' => '嶺',
+  '怜' => '怜',
+  '玲' => '玲',
+  '瑩' => '瑩',
+  '羚' => '羚',
+  '聆' => '聆',
+  '鈴' => '鈴',
+  '零' => '零',
+  '靈' => '靈',
+  '領' => '領',
+  '例' => '例',
+  '禮' => '禮',
+  '醴' => '醴',
+  '隸' => '隸',
+  '惡' => '惡',
+  '了' => '了',
+  '僚' => '僚',
+  '寮' => '寮',
+  '尿' => '尿',
+  '料' => '料',
+  '樂' => '樂',
+  '燎' => '燎',
+  '療' => '療',
+  '蓼' => '蓼',
+  '遼' => '遼',
+  '龍' => '龍',
+  '暈' => '暈',
+  '阮' => '阮',
+  '劉' => '劉',
+  '杻' => '杻',
+  '柳' => '柳',
+  '流' => '流',
+  '溜' => '溜',
+  '琉' => '琉',
+  '留' => '留',
+  '硫' => '硫',
+  '紐' => '紐',
+  '類' => '類',
+  '六' => '六',
+  '戮' => '戮',
+  '陸' => '陸',
+  '倫' => '倫',
+  '崙' => '崙',
+  '淪' => '淪',
+  '輪' => '輪',
+  '律' => '律',
+  '慄' => '慄',
+  '栗' => '栗',
+  '率' => '率',
+  '隆' => '隆',
+  '利' => '利',
+  '吏' => '吏',
+  '履' => '履',
+  '易' => '易',
+  '李' => '李',
+  '梨' => '梨',
+  '泥' => '泥',
+  '理' => '理',
+  '痢' => '痢',
+  '罹' => '罹',
+  '裏' => '裏',
+  '裡' => '裡',
+  '里' => '里',
+  '離' => '離',
+  '匿' => '匿',
+  '溺' => '溺',
+  '吝' => '吝',
+  '燐' => '燐',
+  '璘' => '璘',
+  '藺' => '藺',
+  '隣' => '隣',
+  '鱗' => '鱗',
+  '麟' => '麟',
+  '林' => '林',
+  '淋' => '淋',
+  '臨' => '臨',
+  '立' => '立',
+  '笠' => '笠',
+  '粒' => '粒',
+  '狀' => '狀',
+  '炙' => '炙',
+  '識' => '識',
+  '什' => '什',
+  '茶' => '茶',
+  '刺' => '刺',
+  '切' => '切',
+  '度' => '度',
+  '拓' => '拓',
+  '糖' => '糖',
+  '宅' => '宅',
+  '洞' => '洞',
+  '暴' => '暴',
+  '輻' => '輻',
+  '行' => '行',
+  '降' => '降',
+  '見' => '見',
+  '廓' => '廓',
+  '兀' => '兀',
+  '嗀' => '嗀',
+  '塚' => '塚',
+  '晴' => '晴',
+  '凞' => '凞',
+  '猪' => '猪',
+  '益' => '益',
+  '礼' => '礼',
+  '神' => '神',
+  '祥' => '祥',
+  '福' => '福',
+  '靖' => '靖',
+  '精' => '精',
+  '羽' => '羽',
+  '蘒' => '蘒',
+  '諸' => '諸',
+  '逸' => '逸',
+  '都' => '都',
+  '飯' => '飯',
+  '飼' => '飼',
+  '館' => '館',
+  '鶴' => '鶴',
+  '郞' => '郞',
+  '隷' => '隷',
+  '侮' => '侮',
+  '僧' => '僧',
+  '免' => '免',
+  '勉' => '勉',
+  '勤' => '勤',
+  '卑' => '卑',
+  '喝' => '喝',
+  '嘆' => '嘆',
+  '器' => '器',
+  '塀' => '塀',
+  '墨' => '墨',
+  '層' => '層',
+  '屮' => '屮',
+  '悔' => '悔',
+  '慨' => '慨',
+  '憎' => '憎',
+  '懲' => '懲',
+  '敏' => '敏',
+  '既' => '既',
+  '暑' => '暑',
+  '梅' => '梅',
+  '海' => '海',
+  '渚' => '渚',
+  '漢' => '漢',
+  '煮' => '煮',
+  '爫' => '爫',
+  '琢' => '琢',
+  '碑' => '碑',
+  '社' => '社',
+  '祉' => '祉',
+  '祈' => '祈',
+  '祐' => '祐',
+  '祖' => '祖',
+  '祝' => '祝',
+  '禍' => '禍',
+  '禎' => '禎',
+  '穀' => '穀',
+  '突' => '突',
+  '節' => '節',
+  '練' => '練',
+  '縉' => '縉',
+  '繁' => '繁',
+  '署' => '署',
+  '者' => '者',
+  '臭' => '臭',
+  '艹' => '艹',
+  '艹' => '艹',
+  '著' => '著',
+  '褐' => '褐',
+  '視' => '視',
+  '謁' => '謁',
+  '謹' => '謹',
+  '賓' => '賓',
+  '贈' => '贈',
+  '辶' => '辶',
+  '逸' => '逸',
+  '難' => '難',
+  '響' => '響',
+  '頻' => '頻',
+  '恵' => '恵',
+  '𤋮' => '𤋮',
+  '舘' => '舘',
+  '並' => '並',
+  '况' => '况',
+  '全' => '全',
+  '侀' => '侀',
+  '充' => '充',
+  '冀' => '冀',
+  '勇' => '勇',
+  '勺' => '勺',
+  '喝' => '喝',
+  '啕' => '啕',
+  '喙' => '喙',
+  '嗢' => '嗢',
+  '塚' => '塚',
+  '墳' => '墳',
+  '奄' => '奄',
+  '奔' => '奔',
+  '婢' => '婢',
+  '嬨' => '嬨',
+  '廒' => '廒',
+  '廙' => '廙',
+  '彩' => '彩',
+  '徭' => '徭',
+  '惘' => '惘',
+  '慎' => '慎',
+  '愈' => '愈',
+  '憎' => '憎',
+  '慠' => '慠',
+  '懲' => '懲',
+  '戴' => '戴',
+  '揄' => '揄',
+  '搜' => '搜',
+  '摒' => '摒',
+  '敖' => '敖',
+  '晴' => '晴',
+  '朗' => '朗',
+  '望' => '望',
+  '杖' => '杖',
+  '歹' => '歹',
+  '殺' => '殺',
+  '流' => '流',
+  '滛' => '滛',
+  '滋' => '滋',
+  '漢' => '漢',
+  '瀞' => '瀞',
+  '煮' => '煮',
+  '瞧' => '瞧',
+  '爵' => '爵',
+  '犯' => '犯',
+  '猪' => '猪',
+  '瑱' => '瑱',
+  '甆' => '甆',
+  '画' => '画',
+  '瘝' => '瘝',
+  '瘟' => '瘟',
+  '益' => '益',
+  '盛' => '盛',
+  '直' => '直',
+  '睊' => '睊',
+  '着' => '着',
+  '磌' => '磌',
+  '窱' => '窱',
+  '節' => '節',
+  '类' => '类',
+  '絛' => '絛',
+  '練' => '練',
+  '缾' => '缾',
+  '者' => '者',
+  '荒' => '荒',
+  '華' => '華',
+  '蝹' => '蝹',
+  '襁' => '襁',
+  '覆' => '覆',
+  '視' => '視',
+  '調' => '調',
+  '諸' => '諸',
+  '請' => '請',
+  '謁' => '謁',
+  '諾' => '諾',
+  '諭' => '諭',
+  '謹' => '謹',
+  '變' => '變',
+  '贈' => '贈',
+  '輸' => '輸',
+  '遲' => '遲',
+  '醙' => '醙',
+  '鉶' => '鉶',
+  '陼' => '陼',
+  '難' => '難',
+  '靖' => '靖',
+  '韛' => '韛',
+  '響' => '響',
+  '頋' => '頋',
+  '頻' => '頻',
+  '鬒' => '鬒',
+  '龜' => '龜',
+  '𢡊' => '𢡊',
+  '𢡄' => '𢡄',
+  '𣏕' => '𣏕',
+  '㮝' => '㮝',
+  '䀘' => '䀘',
+  '䀹' => '䀹',
+  '𥉉' => '𥉉',
+  '𥳐' => '𥳐',
+  '𧻓' => '𧻓',
+  '齃' => '齃',
+  '龎' => '龎',
+  'יִ' => 'יִ',
+  'ײַ' => 'ײַ',
+  'שׁ' => 'שׁ',
+  'שׂ' => 'שׂ',
+  'שּׁ' => 'שּׁ',
+  'שּׂ' => 'שּׂ',
+  'אַ' => 'אַ',
+  'אָ' => 'אָ',
+  'אּ' => 'אּ',
+  'בּ' => 'בּ',
+  'גּ' => 'גּ',
+  'דּ' => 'דּ',
+  'הּ' => 'הּ',
+  'וּ' => 'וּ',
+  'זּ' => 'זּ',
+  'טּ' => 'טּ',
+  'יּ' => 'יּ',
+  'ךּ' => 'ךּ',
+  'כּ' => 'כּ',
+  'לּ' => 'לּ',
+  'מּ' => 'מּ',
+  'נּ' => 'נּ',
+  'סּ' => 'סּ',
+  'ףּ' => 'ףּ',
+  'פּ' => 'פּ',
+  'צּ' => 'צּ',
+  'קּ' => 'קּ',
+  'רּ' => 'רּ',
+  'שּ' => 'שּ',
+  'תּ' => 'תּ',
+  'וֹ' => 'וֹ',
+  'בֿ' => 'בֿ',
+  'כֿ' => 'כֿ',
+  'פֿ' => 'פֿ',
+  '𑂚' => '𑂚',
+  '𑂜' => '𑂜',
+  '𑂫' => '𑂫',
+  '𑄮' => '𑄮',
+  '𑄯' => '𑄯',
+  '𑍋' => '𑍋',
+  '𑍌' => '𑍌',
+  '𑒻' => '𑒻',
+  '𑒼' => '𑒼',
+  '𑒾' => '𑒾',
+  '𑖺' => '𑖺',
+  '𑖻' => '𑖻',
+  '𑤸' => '𑤸',
+  '𝅗𝅥' => '𝅗𝅥',
+  '𝅘𝅥' => '𝅘𝅥',
+  '𝅘𝅥𝅮' => '𝅘𝅥𝅮',
+  '𝅘𝅥𝅯' => '𝅘𝅥𝅯',
+  '𝅘𝅥𝅰' => '𝅘𝅥𝅰',
+  '𝅘𝅥𝅱' => '𝅘𝅥𝅱',
+  '𝅘𝅥𝅲' => '𝅘𝅥𝅲',
+  '𝆹𝅥' => '𝆹𝅥',
+  '𝆺𝅥' => '𝆺𝅥',
+  '𝆹𝅥𝅮' => '𝆹𝅥𝅮',
+  '𝆺𝅥𝅮' => '𝆺𝅥𝅮',
+  '𝆹𝅥𝅯' => '𝆹𝅥𝅯',
+  '𝆺𝅥𝅯' => '𝆺𝅥𝅯',
+  '丽' => '丽',
+  '丸' => '丸',
+  '乁' => '乁',
+  '𠄢' => '𠄢',
+  '你' => '你',
+  '侮' => '侮',
+  '侻' => '侻',
+  '倂' => '倂',
+  '偺' => '偺',
+  '備' => '備',
+  '僧' => '僧',
+  '像' => '像',
+  '㒞' => '㒞',
+  '𠘺' => '𠘺',
+  '免' => '免',
+  '兔' => '兔',
+  '兤' => '兤',
+  '具' => '具',
+  '𠔜' => '𠔜',
+  '㒹' => '㒹',
+  '內' => '內',
+  '再' => '再',
+  '𠕋' => '𠕋',
+  '冗' => '冗',
+  '冤' => '冤',
+  '仌' => '仌',
+  '冬' => '冬',
+  '况' => '况',
+  '𩇟' => '𩇟',
+  '凵' => '凵',
+  '刃' => '刃',
+  '㓟' => '㓟',
+  '刻' => '刻',
+  '剆' => '剆',
+  '割' => '割',
+  '剷' => '剷',
+  '㔕' => '㔕',
+  '勇' => '勇',
+  '勉' => '勉',
+  '勤' => '勤',
+  '勺' => '勺',
+  '包' => '包',
+  '匆' => '匆',
+  '北' => '北',
+  '卉' => '卉',
+  '卑' => '卑',
+  '博' => '博',
+  '即' => '即',
+  '卽' => '卽',
+  '卿' => '卿',
+  '卿' => '卿',
+  '卿' => '卿',
+  '𠨬' => '𠨬',
+  '灰' => '灰',
+  '及' => '及',
+  '叟' => '叟',
+  '𠭣' => '𠭣',
+  '叫' => '叫',
+  '叱' => '叱',
+  '吆' => '吆',
+  '咞' => '咞',
+  '吸' => '吸',
+  '呈' => '呈',
+  '周' => '周',
+  '咢' => '咢',
+  '哶' => '哶',
+  '唐' => '唐',
+  '啓' => '啓',
+  '啣' => '啣',
+  '善' => '善',
+  '善' => '善',
+  '喙' => '喙',
+  '喫' => '喫',
+  '喳' => '喳',
+  '嗂' => '嗂',
+  '圖' => '圖',
+  '嘆' => '嘆',
+  '圗' => '圗',
+  '噑' => '噑',
+  '噴' => '噴',
+  '切' => '切',
+  '壮' => '壮',
+  '城' => '城',
+  '埴' => '埴',
+  '堍' => '堍',
+  '型' => '型',
+  '堲' => '堲',
+  '報' => '報',
+  '墬' => '墬',
+  '𡓤' => '𡓤',
+  '売' => '売',
+  '壷' => '壷',
+  '夆' => '夆',
+  '多' => '多',
+  '夢' => '夢',
+  '奢' => '奢',
+  '𡚨' => '𡚨',
+  '𡛪' => '𡛪',
+  '姬' => '姬',
+  '娛' => '娛',
+  '娧' => '娧',
+  '姘' => '姘',
+  '婦' => '婦',
+  '㛮' => '㛮',
+  '㛼' => '㛼',
+  '嬈' => '嬈',
+  '嬾' => '嬾',
+  '嬾' => '嬾',
+  '𡧈' => '𡧈',
+  '寃' => '寃',
+  '寘' => '寘',
+  '寧' => '寧',
+  '寳' => '寳',
+  '𡬘' => '𡬘',
+  '寿' => '寿',
+  '将' => '将',
+  '当' => '当',
+  '尢' => '尢',
+  '㞁' => '㞁',
+  '屠' => '屠',
+  '屮' => '屮',
+  '峀' => '峀',
+  '岍' => '岍',
+  '𡷤' => '𡷤',
+  '嵃' => '嵃',
+  '𡷦' => '𡷦',
+  '嵮' => '嵮',
+  '嵫' => '嵫',
+  '嵼' => '嵼',
+  '巡' => '巡',
+  '巢' => '巢',
+  '㠯' => '㠯',
+  '巽' => '巽',
+  '帨' => '帨',
+  '帽' => '帽',
+  '幩' => '幩',
+  '㡢' => '㡢',
+  '𢆃' => '𢆃',
+  '㡼' => '㡼',
+  '庰' => '庰',
+  '庳' => '庳',
+  '庶' => '庶',
+  '廊' => '廊',
+  '𪎒' => '𪎒',
+  '廾' => '廾',
+  '𢌱' => '𢌱',
+  '𢌱' => '𢌱',
+  '舁' => '舁',
+  '弢' => '弢',
+  '弢' => '弢',
+  '㣇' => '㣇',
+  '𣊸' => '𣊸',
+  '𦇚' => '𦇚',
+  '形' => '形',
+  '彫' => '彫',
+  '㣣' => '㣣',
+  '徚' => '徚',
+  '忍' => '忍',
+  '志' => '志',
+  '忹' => '忹',
+  '悁' => '悁',
+  '㤺' => '㤺',
+  '㤜' => '㤜',
+  '悔' => '悔',
+  '𢛔' => '𢛔',
+  '惇' => '惇',
+  '慈' => '慈',
+  '慌' => '慌',
+  '慎' => '慎',
+  '慌' => '慌',
+  '慺' => '慺',
+  '憎' => '憎',
+  '憲' => '憲',
+  '憤' => '憤',
+  '憯' => '憯',
+  '懞' => '懞',
+  '懲' => '懲',
+  '懶' => '懶',
+  '成' => '成',
+  '戛' => '戛',
+  '扝' => '扝',
+  '抱' => '抱',
+  '拔' => '拔',
+  '捐' => '捐',
+  '𢬌' => '𢬌',
+  '挽' => '挽',
+  '拼' => '拼',
+  '捨' => '捨',
+  '掃' => '掃',
+  '揤' => '揤',
+  '𢯱' => '𢯱',
+  '搢' => '搢',
+  '揅' => '揅',
+  '掩' => '掩',
+  '㨮' => '㨮',
+  '摩' => '摩',
+  '摾' => '摾',
+  '撝' => '撝',
+  '摷' => '摷',
+  '㩬' => '㩬',
+  '敏' => '敏',
+  '敬' => '敬',
+  '𣀊' => '𣀊',
+  '旣' => '旣',
+  '書' => '書',
+  '晉' => '晉',
+  '㬙' => '㬙',
+  '暑' => '暑',
+  '㬈' => '㬈',
+  '㫤' => '㫤',
+  '冒' => '冒',
+  '冕' => '冕',
+  '最' => '最',
+  '暜' => '暜',
+  '肭' => '肭',
+  '䏙' => '䏙',
+  '朗' => '朗',
+  '望' => '望',
+  '朡' => '朡',
+  '杞' => '杞',
+  '杓' => '杓',
+  '𣏃' => '𣏃',
+  '㭉' => '㭉',
+  '柺' => '柺',
+  '枅' => '枅',
+  '桒' => '桒',
+  '梅' => '梅',
+  '𣑭' => '𣑭',
+  '梎' => '梎',
+  '栟' => '栟',
+  '椔' => '椔',
+  '㮝' => '㮝',
+  '楂' => '楂',
+  '榣' => '榣',
+  '槪' => '槪',
+  '檨' => '檨',
+  '𣚣' => '𣚣',
+  '櫛' => '櫛',
+  '㰘' => '㰘',
+  '次' => '次',
+  '𣢧' => '𣢧',
+  '歔' => '歔',
+  '㱎' => '㱎',
+  '歲' => '歲',
+  '殟' => '殟',
+  '殺' => '殺',
+  '殻' => '殻',
+  '𣪍' => '𣪍',
+  '𡴋' => '𡴋',
+  '𣫺' => '𣫺',
+  '汎' => '汎',
+  '𣲼' => '𣲼',
+  '沿' => '沿',
+  '泍' => '泍',
+  '汧' => '汧',
+  '洖' => '洖',
+  '派' => '派',
+  '海' => '海',
+  '流' => '流',
+  '浩' => '浩',
+  '浸' => '浸',
+  '涅' => '涅',
+  '𣴞' => '𣴞',
+  '洴' => '洴',
+  '港' => '港',
+  '湮' => '湮',
+  '㴳' => '㴳',
+  '滋' => '滋',
+  '滇' => '滇',
+  '𣻑' => '𣻑',
+  '淹' => '淹',
+  '潮' => '潮',
+  '𣽞' => '𣽞',
+  '𣾎' => '𣾎',
+  '濆' => '濆',
+  '瀹' => '瀹',
+  '瀞' => '瀞',
+  '瀛' => '瀛',
+  '㶖' => '㶖',
+  '灊' => '灊',
+  '災' => '災',
+  '灷' => '灷',
+  '炭' => '炭',
+  '𠔥' => '𠔥',
+  '煅' => '煅',
+  '𤉣' => '𤉣',
+  '熜' => '熜',
+  '𤎫' => '𤎫',
+  '爨' => '爨',
+  '爵' => '爵',
+  '牐' => '牐',
+  '𤘈' => '𤘈',
+  '犀' => '犀',
+  '犕' => '犕',
+  '𤜵' => '𤜵',
+  '𤠔' => '𤠔',
+  '獺' => '獺',
+  '王' => '王',
+  '㺬' => '㺬',
+  '玥' => '玥',
+  '㺸' => '㺸',
+  '㺸' => '㺸',
+  '瑇' => '瑇',
+  '瑜' => '瑜',
+  '瑱' => '瑱',
+  '璅' => '璅',
+  '瓊' => '瓊',
+  '㼛' => '㼛',
+  '甤' => '甤',
+  '𤰶' => '𤰶',
+  '甾' => '甾',
+  '𤲒' => '𤲒',
+  '異' => '異',
+  '𢆟' => '𢆟',
+  '瘐' => '瘐',
+  '𤾡' => '𤾡',
+  '𤾸' => '𤾸',
+  '𥁄' => '𥁄',
+  '㿼' => '㿼',
+  '䀈' => '䀈',
+  '直' => '直',
+  '𥃳' => '𥃳',
+  '𥃲' => '𥃲',
+  '𥄙' => '𥄙',
+  '𥄳' => '𥄳',
+  '眞' => '眞',
+  '真' => '真',
+  '真' => '真',
+  '睊' => '睊',
+  '䀹' => '䀹',
+  '瞋' => '瞋',
+  '䁆' => '䁆',
+  '䂖' => '䂖',
+  '𥐝' => '𥐝',
+  '硎' => '硎',
+  '碌' => '碌',
+  '磌' => '磌',
+  '䃣' => '䃣',
+  '𥘦' => '𥘦',
+  '祖' => '祖',
+  '𥚚' => '𥚚',
+  '𥛅' => '𥛅',
+  '福' => '福',
+  '秫' => '秫',
+  '䄯' => '䄯',
+  '穀' => '穀',
+  '穊' => '穊',
+  '穏' => '穏',
+  '𥥼' => '𥥼',
+  '𥪧' => '𥪧',
+  '𥪧' => '𥪧',
+  '竮' => '竮',
+  '䈂' => '䈂',
+  '𥮫' => '𥮫',
+  '篆' => '篆',
+  '築' => '築',
+  '䈧' => '䈧',
+  '𥲀' => '𥲀',
+  '糒' => '糒',
+  '䊠' => '䊠',
+  '糨' => '糨',
+  '糣' => '糣',
+  '紀' => '紀',
+  '𥾆' => '𥾆',
+  '絣' => '絣',
+  '䌁' => '䌁',
+  '緇' => '緇',
+  '縂' => '縂',
+  '繅' => '繅',
+  '䌴' => '䌴',
+  '𦈨' => '𦈨',
+  '𦉇' => '𦉇',
+  '䍙' => '䍙',
+  '𦋙' => '𦋙',
+  '罺' => '罺',
+  '𦌾' => '𦌾',
+  '羕' => '羕',
+  '翺' => '翺',
+  '者' => '者',
+  '𦓚' => '𦓚',
+  '𦔣' => '𦔣',
+  '聠' => '聠',
+  '𦖨' => '𦖨',
+  '聰' => '聰',
+  '𣍟' => '𣍟',
+  '䏕' => '䏕',
+  '育' => '育',
+  '脃' => '脃',
+  '䐋' => '䐋',
+  '脾' => '脾',
+  '媵' => '媵',
+  '𦞧' => '𦞧',
+  '𦞵' => '𦞵',
+  '𣎓' => '𣎓',
+  '𣎜' => '𣎜',
+  '舁' => '舁',
+  '舄' => '舄',
+  '辞' => '辞',
+  '䑫' => '䑫',
+  '芑' => '芑',
+  '芋' => '芋',
+  '芝' => '芝',
+  '劳' => '劳',
+  '花' => '花',
+  '芳' => '芳',
+  '芽' => '芽',
+  '苦' => '苦',
+  '𦬼' => '𦬼',
+  '若' => '若',
+  '茝' => '茝',
+  '荣' => '荣',
+  '莭' => '莭',
+  '茣' => '茣',
+  '莽' => '莽',
+  '菧' => '菧',
+  '著' => '著',
+  '荓' => '荓',
+  '菊' => '菊',
+  '菌' => '菌',
+  '菜' => '菜',
+  '𦰶' => '𦰶',
+  '𦵫' => '𦵫',
+  '𦳕' => '𦳕',
+  '䔫' => '䔫',
+  '蓱' => '蓱',
+  '蓳' => '蓳',
+  '蔖' => '蔖',
+  '𧏊' => '𧏊',
+  '蕤' => '蕤',
+  '𦼬' => '𦼬',
+  '䕝' => '䕝',
+  '䕡' => '䕡',
+  '𦾱' => '𦾱',
+  '𧃒' => '𧃒',
+  '䕫' => '䕫',
+  '虐' => '虐',
+  '虜' => '虜',
+  '虧' => '虧',
+  '虩' => '虩',
+  '蚩' => '蚩',
+  '蚈' => '蚈',
+  '蜎' => '蜎',
+  '蛢' => '蛢',
+  '蝹' => '蝹',
+  '蜨' => '蜨',
+  '蝫' => '蝫',
+  '螆' => '螆',
+  '䗗' => '䗗',
+  '蟡' => '蟡',
+  '蠁' => '蠁',
+  '䗹' => '䗹',
+  '衠' => '衠',
+  '衣' => '衣',
+  '𧙧' => '𧙧',
+  '裗' => '裗',
+  '裞' => '裞',
+  '䘵' => '䘵',
+  '裺' => '裺',
+  '㒻' => '㒻',
+  '𧢮' => '𧢮',
+  '𧥦' => '𧥦',
+  '䚾' => '䚾',
+  '䛇' => '䛇',
+  '誠' => '誠',
+  '諭' => '諭',
+  '變' => '變',
+  '豕' => '豕',
+  '𧲨' => '𧲨',
+  '貫' => '貫',
+  '賁' => '賁',
+  '贛' => '贛',
+  '起' => '起',
+  '𧼯' => '𧼯',
+  '𠠄' => '𠠄',
+  '跋' => '跋',
+  '趼' => '趼',
+  '跰' => '跰',
+  '𠣞' => '𠣞',
+  '軔' => '軔',
+  '輸' => '輸',
+  '𨗒' => '𨗒',
+  '𨗭' => '𨗭',
+  '邔' => '邔',
+  '郱' => '郱',
+  '鄑' => '鄑',
+  '𨜮' => '𨜮',
+  '鄛' => '鄛',
+  '鈸' => '鈸',
+  '鋗' => '鋗',
+  '鋘' => '鋘',
+  '鉼' => '鉼',
+  '鏹' => '鏹',
+  '鐕' => '鐕',
+  '𨯺' => '𨯺',
+  '開' => '開',
+  '䦕' => '䦕',
+  '閷' => '閷',
+  '𨵷' => '𨵷',
+  '䧦' => '䧦',
+  '雃' => '雃',
+  '嶲' => '嶲',
+  '霣' => '霣',
+  '𩅅' => '𩅅',
+  '𩈚' => '𩈚',
+  '䩮' => '䩮',
+  '䩶' => '䩶',
+  '韠' => '韠',
+  '𩐊' => '𩐊',
+  '䪲' => '䪲',
+  '𩒖' => '𩒖',
+  '頋' => '頋',
+  '頋' => '頋',
+  '頩' => '頩',
+  '𩖶' => '𩖶',
+  '飢' => '飢',
+  '䬳' => '䬳',
+  '餩' => '餩',
+  '馧' => '馧',
+  '駂' => '駂',
+  '駾' => '駾',
+  '䯎' => '䯎',
+  '𩬰' => '𩬰',
+  '鬒' => '鬒',
+  '鱀' => '鱀',
+  '鳽' => '鳽',
+  '䳎' => '䳎',
+  '䳭' => '䳭',
+  '鵧' => '鵧',
+  '𪃎' => '𪃎',
+  '䳸' => '䳸',
+  '𪄅' => '𪄅',
+  '𪈎' => '𪈎',
+  '𪊑' => '𪊑',
+  '麻' => '麻',
+  '䵖' => '䵖',
+  '黹' => '黹',
+  '黾' => '黾',
+  '鼅' => '鼅',
+  '鼏' => '鼏',
+  '鼖' => '鼖',
+  '鼻' => '鼻',
+  '𪘀' => '𪘀',
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php
new file mode 100644
index 000000000..ec90f36eb
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php
@@ -0,0 +1,876 @@
+<?php
+
+return array (
+  '̀' => 230,
+  '́' => 230,
+  '̂' => 230,
+  '̃' => 230,
+  '̄' => 230,
+  '̅' => 230,
+  '̆' => 230,
+  '̇' => 230,
+  '̈' => 230,
+  '̉' => 230,
+  '̊' => 230,
+  '̋' => 230,
+  '̌' => 230,
+  '̍' => 230,
+  '̎' => 230,
+  '̏' => 230,
+  '̐' => 230,
+  '̑' => 230,
+  '̒' => 230,
+  '̓' => 230,
+  '̔' => 230,
+  '̕' => 232,
+  '̖' => 220,
+  '̗' => 220,
+  '̘' => 220,
+  '̙' => 220,
+  '̚' => 232,
+  '̛' => 216,
+  '̜' => 220,
+  '̝' => 220,
+  '̞' => 220,
+  '̟' => 220,
+  '̠' => 220,
+  '̡' => 202,
+  '̢' => 202,
+  '̣' => 220,
+  '̤' => 220,
+  '̥' => 220,
+  '̦' => 220,
+  '̧' => 202,
+  '̨' => 202,
+  '̩' => 220,
+  '̪' => 220,
+  '̫' => 220,
+  '̬' => 220,
+  '̭' => 220,
+  '̮' => 220,
+  '̯' => 220,
+  '̰' => 220,
+  '̱' => 220,
+  '̲' => 220,
+  '̳' => 220,
+  '̴' => 1,
+  '̵' => 1,
+  '̶' => 1,
+  '̷' => 1,
+  '̸' => 1,
+  '̹' => 220,
+  '̺' => 220,
+  '̻' => 220,
+  '̼' => 220,
+  '̽' => 230,
+  '̾' => 230,
+  '̿' => 230,
+  '̀' => 230,
+  '́' => 230,
+  '͂' => 230,
+  '̓' => 230,
+  '̈́' => 230,
+  'ͅ' => 240,
+  '͆' => 230,
+  '͇' => 220,
+  '͈' => 220,
+  '͉' => 220,
+  '͊' => 230,
+  '͋' => 230,
+  '͌' => 230,
+  '͍' => 220,
+  '͎' => 220,
+  '͐' => 230,
+  '͑' => 230,
+  '͒' => 230,
+  '͓' => 220,
+  '͔' => 220,
+  '͕' => 220,
+  '͖' => 220,
+  '͗' => 230,
+  '͘' => 232,
+  '͙' => 220,
+  '͚' => 220,
+  '͛' => 230,
+  '͜' => 233,
+  '͝' => 234,
+  '͞' => 234,
+  '͟' => 233,
+  '͠' => 234,
+  '͡' => 234,
+  '͢' => 233,
+  'ͣ' => 230,
+  'ͤ' => 230,
+  'ͥ' => 230,
+  'ͦ' => 230,
+  'ͧ' => 230,
+  'ͨ' => 230,
+  'ͩ' => 230,
+  'ͪ' => 230,
+  'ͫ' => 230,
+  'ͬ' => 230,
+  'ͭ' => 230,
+  'ͮ' => 230,
+  'ͯ' => 230,
+  '҃' => 230,
+  '҄' => 230,
+  '҅' => 230,
+  '҆' => 230,
+  '҇' => 230,
+  '֑' => 220,
+  '֒' => 230,
+  '֓' => 230,
+  '֔' => 230,
+  '֕' => 230,
+  '֖' => 220,
+  '֗' => 230,
+  '֘' => 230,
+  '֙' => 230,
+  '֚' => 222,
+  '֛' => 220,
+  '֜' => 230,
+  '֝' => 230,
+  '֞' => 230,
+  '֟' => 230,
+  '֠' => 230,
+  '֡' => 230,
+  '֢' => 220,
+  '֣' => 220,
+  '֤' => 220,
+  '֥' => 220,
+  '֦' => 220,
+  '֧' => 220,
+  '֨' => 230,
+  '֩' => 230,
+  '֪' => 220,
+  '֫' => 230,
+  '֬' => 230,
+  '֭' => 222,
+  '֮' => 228,
+  '֯' => 230,
+  'ְ' => 10,
+  'ֱ' => 11,
+  'ֲ' => 12,
+  'ֳ' => 13,
+  'ִ' => 14,
+  'ֵ' => 15,
+  'ֶ' => 16,
+  'ַ' => 17,
+  'ָ' => 18,
+  'ֹ' => 19,
+  'ֺ' => 19,
+  'ֻ' => 20,
+  'ּ' => 21,
+  'ֽ' => 22,
+  'ֿ' => 23,
+  'ׁ' => 24,
+  'ׂ' => 25,
+  'ׄ' => 230,
+  'ׅ' => 220,
+  'ׇ' => 18,
+  'ؐ' => 230,
+  'ؑ' => 230,
+  'ؒ' => 230,
+  'ؓ' => 230,
+  'ؔ' => 230,
+  'ؕ' => 230,
+  'ؖ' => 230,
+  'ؗ' => 230,
+  'ؘ' => 30,
+  'ؙ' => 31,
+  'ؚ' => 32,
+  'ً' => 27,
+  'ٌ' => 28,
+  'ٍ' => 29,
+  'َ' => 30,
+  'ُ' => 31,
+  'ِ' => 32,
+  'ّ' => 33,
+  'ْ' => 34,
+  'ٓ' => 230,
+  'ٔ' => 230,
+  'ٕ' => 220,
+  'ٖ' => 220,
+  'ٗ' => 230,
+  '٘' => 230,
+  'ٙ' => 230,
+  'ٚ' => 230,
+  'ٛ' => 230,
+  'ٜ' => 220,
+  'ٝ' => 230,
+  'ٞ' => 230,
+  'ٟ' => 220,
+  'ٰ' => 35,
+  'ۖ' => 230,
+  'ۗ' => 230,
+  'ۘ' => 230,
+  'ۙ' => 230,
+  'ۚ' => 230,
+  'ۛ' => 230,
+  'ۜ' => 230,
+  '۟' => 230,
+  '۠' => 230,
+  'ۡ' => 230,
+  'ۢ' => 230,
+  'ۣ' => 220,
+  'ۤ' => 230,
+  'ۧ' => 230,
+  'ۨ' => 230,
+  '۪' => 220,
+  '۫' => 230,
+  '۬' => 230,
+  'ۭ' => 220,
+  'ܑ' => 36,
+  'ܰ' => 230,
+  'ܱ' => 220,
+  'ܲ' => 230,
+  'ܳ' => 230,
+  'ܴ' => 220,
+  'ܵ' => 230,
+  'ܶ' => 230,
+  'ܷ' => 220,
+  'ܸ' => 220,
+  'ܹ' => 220,
+  'ܺ' => 230,
+  'ܻ' => 220,
+  'ܼ' => 220,
+  'ܽ' => 230,
+  'ܾ' => 220,
+  'ܿ' => 230,
+  '݀' => 230,
+  '݁' => 230,
+  '݂' => 220,
+  '݃' => 230,
+  '݄' => 220,
+  '݅' => 230,
+  '݆' => 220,
+  '݇' => 230,
+  '݈' => 220,
+  '݉' => 230,
+  '݊' => 230,
+  '߫' => 230,
+  '߬' => 230,
+  '߭' => 230,
+  '߮' => 230,
+  '߯' => 230,
+  '߰' => 230,
+  '߱' => 230,
+  '߲' => 220,
+  '߳' => 230,
+  '߽' => 220,
+  'ࠖ' => 230,
+  'ࠗ' => 230,
+  '࠘' => 230,
+  '࠙' => 230,
+  'ࠛ' => 230,
+  'ࠜ' => 230,
+  'ࠝ' => 230,
+  'ࠞ' => 230,
+  'ࠟ' => 230,
+  'ࠠ' => 230,
+  'ࠡ' => 230,
+  'ࠢ' => 230,
+  'ࠣ' => 230,
+  'ࠥ' => 230,
+  'ࠦ' => 230,
+  'ࠧ' => 230,
+  'ࠩ' => 230,
+  'ࠪ' => 230,
+  'ࠫ' => 230,
+  'ࠬ' => 230,
+  '࠭' => 230,
+  '࡙' => 220,
+  '࡚' => 220,
+  '࡛' => 220,
+  '࣓' => 220,
+  'ࣔ' => 230,
+  'ࣕ' => 230,
+  'ࣖ' => 230,
+  'ࣗ' => 230,
+  'ࣘ' => 230,
+  'ࣙ' => 230,
+  'ࣚ' => 230,
+  'ࣛ' => 230,
+  'ࣜ' => 230,
+  'ࣝ' => 230,
+  'ࣞ' => 230,
+  'ࣟ' => 230,
+  '࣠' => 230,
+  '࣡' => 230,
+  'ࣣ' => 220,
+  'ࣤ' => 230,
+  'ࣥ' => 230,
+  'ࣦ' => 220,
+  'ࣧ' => 230,
+  'ࣨ' => 230,
+  'ࣩ' => 220,
+  '࣪' => 230,
+  '࣫' => 230,
+  '࣬' => 230,
+  '࣭' => 220,
+  '࣮' => 220,
+  '࣯' => 220,
+  'ࣰ' => 27,
+  'ࣱ' => 28,
+  'ࣲ' => 29,
+  'ࣳ' => 230,
+  'ࣴ' => 230,
+  'ࣵ' => 230,
+  'ࣶ' => 220,
+  'ࣷ' => 230,
+  'ࣸ' => 230,
+  'ࣹ' => 220,
+  'ࣺ' => 220,
+  'ࣻ' => 230,
+  'ࣼ' => 230,
+  'ࣽ' => 230,
+  'ࣾ' => 230,
+  'ࣿ' => 230,
+  '़' => 7,
+  '्' => 9,
+  '॑' => 230,
+  '॒' => 220,
+  '॓' => 230,
+  '॔' => 230,
+  '়' => 7,
+  '্' => 9,
+  '৾' => 230,
+  '਼' => 7,
+  '੍' => 9,
+  '઼' => 7,
+  '્' => 9,
+  '଼' => 7,
+  '୍' => 9,
+  '்' => 9,
+  '్' => 9,
+  'ౕ' => 84,
+  'ౖ' => 91,
+  '಼' => 7,
+  '್' => 9,
+  '഻' => 9,
+  '഼' => 9,
+  '്' => 9,
+  '්' => 9,
+  'ุ' => 103,
+  'ู' => 103,
+  'ฺ' => 9,
+  '่' => 107,
+  '้' => 107,
+  '๊' => 107,
+  '๋' => 107,
+  'ຸ' => 118,
+  'ູ' => 118,
+  '຺' => 9,
+  '່' => 122,
+  '້' => 122,
+  '໊' => 122,
+  '໋' => 122,
+  '༘' => 220,
+  '༙' => 220,
+  '༵' => 220,
+  '༷' => 220,
+  '༹' => 216,
+  'ཱ' => 129,
+  'ི' => 130,
+  'ུ' => 132,
+  'ེ' => 130,
+  'ཻ' => 130,
+  'ོ' => 130,
+  'ཽ' => 130,
+  'ྀ' => 130,
+  'ྂ' => 230,
+  'ྃ' => 230,
+  '྄' => 9,
+  '྆' => 230,
+  '྇' => 230,
+  '࿆' => 220,
+  '့' => 7,
+  '္' => 9,
+  '်' => 9,
+  'ႍ' => 220,
+  '፝' => 230,
+  '፞' => 230,
+  '፟' => 230,
+  '᜔' => 9,
+  '᜴' => 9,
+  '្' => 9,
+  '៝' => 230,
+  'ᢩ' => 228,
+  '᤹' => 222,
+  '᤺' => 230,
+  '᤻' => 220,
+  'ᨗ' => 230,
+  'ᨘ' => 220,
+  '᩠' => 9,
+  '᩵' => 230,
+  '᩶' => 230,
+  '᩷' => 230,
+  '᩸' => 230,
+  '᩹' => 230,
+  '᩺' => 230,
+  '᩻' => 230,
+  '᩼' => 230,
+  '᩿' => 220,
+  '᪰' => 230,
+  '᪱' => 230,
+  '᪲' => 230,
+  '᪳' => 230,
+  '᪴' => 230,
+  '᪵' => 220,
+  '᪶' => 220,
+  '᪷' => 220,
+  '᪸' => 220,
+  '᪹' => 220,
+  '᪺' => 220,
+  '᪻' => 230,
+  '᪼' => 230,
+  '᪽' => 220,
+  'ᪿ' => 220,
+  'ᫀ' => 220,
+  '᬴' => 7,
+  '᭄' => 9,
+  '᭫' => 230,
+  '᭬' => 220,
+  '᭭' => 230,
+  '᭮' => 230,
+  '᭯' => 230,
+  '᭰' => 230,
+  '᭱' => 230,
+  '᭲' => 230,
+  '᭳' => 230,
+  '᮪' => 9,
+  '᮫' => 9,
+  '᯦' => 7,
+  '᯲' => 9,
+  '᯳' => 9,
+  '᰷' => 7,
+  '᳐' => 230,
+  '᳑' => 230,
+  '᳒' => 230,
+  '᳔' => 1,
+  '᳕' => 220,
+  '᳖' => 220,
+  '᳗' => 220,
+  '᳘' => 220,
+  '᳙' => 220,
+  '᳚' => 230,
+  '᳛' => 230,
+  '᳜' => 220,
+  '᳝' => 220,
+  '᳞' => 220,
+  '᳟' => 220,
+  '᳠' => 230,
+  '᳢' => 1,
+  '᳣' => 1,
+  '᳤' => 1,
+  '᳥' => 1,
+  '᳦' => 1,
+  '᳧' => 1,
+  '᳨' => 1,
+  '᳭' => 220,
+  '᳴' => 230,
+  '᳸' => 230,
+  '᳹' => 230,
+  '᷀' => 230,
+  '᷁' => 230,
+  '᷂' => 220,
+  '᷃' => 230,
+  '᷄' => 230,
+  '᷅' => 230,
+  '᷆' => 230,
+  '᷇' => 230,
+  '᷈' => 230,
+  '᷉' => 230,
+  '᷊' => 220,
+  '᷋' => 230,
+  '᷌' => 230,
+  '᷍' => 234,
+  '᷎' => 214,
+  '᷏' => 220,
+  '᷐' => 202,
+  '᷑' => 230,
+  '᷒' => 230,
+  'ᷓ' => 230,
+  'ᷔ' => 230,
+  'ᷕ' => 230,
+  'ᷖ' => 230,
+  'ᷗ' => 230,
+  'ᷘ' => 230,
+  'ᷙ' => 230,
+  'ᷚ' => 230,
+  'ᷛ' => 230,
+  'ᷜ' => 230,
+  'ᷝ' => 230,
+  'ᷞ' => 230,
+  'ᷟ' => 230,
+  'ᷠ' => 230,
+  'ᷡ' => 230,
+  'ᷢ' => 230,
+  'ᷣ' => 230,
+  'ᷤ' => 230,
+  'ᷥ' => 230,
+  'ᷦ' => 230,
+  'ᷧ' => 230,
+  'ᷨ' => 230,
+  'ᷩ' => 230,
+  'ᷪ' => 230,
+  'ᷫ' => 230,
+  'ᷬ' => 230,
+  'ᷭ' => 230,
+  'ᷮ' => 230,
+  'ᷯ' => 230,
+  'ᷰ' => 230,
+  'ᷱ' => 230,
+  'ᷲ' => 230,
+  'ᷳ' => 230,
+  'ᷴ' => 230,
+  '᷵' => 230,
+  '᷶' => 232,
+  '᷷' => 228,
+  '᷸' => 228,
+  '᷹' => 220,
+  '᷻' => 230,
+  '᷼' => 233,
+  '᷽' => 220,
+  '᷾' => 230,
+  '᷿' => 220,
+  '⃐' => 230,
+  '⃑' => 230,
+  '⃒' => 1,
+  '⃓' => 1,
+  '⃔' => 230,
+  '⃕' => 230,
+  '⃖' => 230,
+  '⃗' => 230,
+  '⃘' => 1,
+  '⃙' => 1,
+  '⃚' => 1,
+  '⃛' => 230,
+  '⃜' => 230,
+  '⃡' => 230,
+  '⃥' => 1,
+  '⃦' => 1,
+  '⃧' => 230,
+  '⃨' => 220,
+  '⃩' => 230,
+  '⃪' => 1,
+  '⃫' => 1,
+  '⃬' => 220,
+  '⃭' => 220,
+  '⃮' => 220,
+  '⃯' => 220,
+  '⃰' => 230,
+  '⳯' => 230,
+  '⳰' => 230,
+  '⳱' => 230,
+  '⵿' => 9,
+  'ⷠ' => 230,
+  'ⷡ' => 230,
+  'ⷢ' => 230,
+  'ⷣ' => 230,
+  'ⷤ' => 230,
+  'ⷥ' => 230,
+  'ⷦ' => 230,
+  'ⷧ' => 230,
+  'ⷨ' => 230,
+  'ⷩ' => 230,
+  'ⷪ' => 230,
+  'ⷫ' => 230,
+  'ⷬ' => 230,
+  'ⷭ' => 230,
+  'ⷮ' => 230,
+  'ⷯ' => 230,
+  'ⷰ' => 230,
+  'ⷱ' => 230,
+  'ⷲ' => 230,
+  'ⷳ' => 230,
+  'ⷴ' => 230,
+  'ⷵ' => 230,
+  'ⷶ' => 230,
+  'ⷷ' => 230,
+  'ⷸ' => 230,
+  'ⷹ' => 230,
+  'ⷺ' => 230,
+  'ⷻ' => 230,
+  'ⷼ' => 230,
+  'ⷽ' => 230,
+  'ⷾ' => 230,
+  'ⷿ' => 230,
+  '〪' => 218,
+  '〫' => 228,
+  '〬' => 232,
+  '〭' => 222,
+  '〮' => 224,
+  '〯' => 224,
+  '゙' => 8,
+  '゚' => 8,
+  '꙯' => 230,
+  'ꙴ' => 230,
+  'ꙵ' => 230,
+  'ꙶ' => 230,
+  'ꙷ' => 230,
+  'ꙸ' => 230,
+  'ꙹ' => 230,
+  'ꙺ' => 230,
+  'ꙻ' => 230,
+  '꙼' => 230,
+  '꙽' => 230,
+  'ꚞ' => 230,
+  'ꚟ' => 230,
+  '꛰' => 230,
+  '꛱' => 230,
+  '꠆' => 9,
+  '꠬' => 9,
+  '꣄' => 9,
+  '꣠' => 230,
+  '꣡' => 230,
+  '꣢' => 230,
+  '꣣' => 230,
+  '꣤' => 230,
+  '꣥' => 230,
+  '꣦' => 230,
+  '꣧' => 230,
+  '꣨' => 230,
+  '꣩' => 230,
+  '꣪' => 230,
+  '꣫' => 230,
+  '꣬' => 230,
+  '꣭' => 230,
+  '꣮' => 230,
+  '꣯' => 230,
+  '꣰' => 230,
+  '꣱' => 230,
+  '꤫' => 220,
+  '꤬' => 220,
+  '꤭' => 220,
+  '꥓' => 9,
+  '꦳' => 7,
+  '꧀' => 9,
+  'ꪰ' => 230,
+  'ꪲ' => 230,
+  'ꪳ' => 230,
+  'ꪴ' => 220,
+  'ꪷ' => 230,
+  'ꪸ' => 230,
+  'ꪾ' => 230,
+  '꪿' => 230,
+  '꫁' => 230,
+  '꫶' => 9,
+  '꯭' => 9,
+  'ﬞ' => 26,
+  '︠' => 230,
+  '︡' => 230,
+  '︢' => 230,
+  '︣' => 230,
+  '︤' => 230,
+  '︥' => 230,
+  '︦' => 230,
+  '︧' => 220,
+  '︨' => 220,
+  '︩' => 220,
+  '︪' => 220,
+  '︫' => 220,
+  '︬' => 220,
+  '︭' => 220,
+  '︮' => 230,
+  '︯' => 230,
+  '𐇽' => 220,
+  '𐋠' => 220,
+  '𐍶' => 230,
+  '𐍷' => 230,
+  '𐍸' => 230,
+  '𐍹' => 230,
+  '𐍺' => 230,
+  '𐨍' => 220,
+  '𐨏' => 230,
+  '𐨸' => 230,
+  '𐨹' => 1,
+  '𐨺' => 220,
+  '𐨿' => 9,
+  '𐫥' => 230,
+  '𐫦' => 220,
+  '𐴤' => 230,
+  '𐴥' => 230,
+  '𐴦' => 230,
+  '𐴧' => 230,
+  '𐺫' => 230,
+  '𐺬' => 230,
+  '𐽆' => 220,
+  '𐽇' => 220,
+  '𐽈' => 230,
+  '𐽉' => 230,
+  '𐽊' => 230,
+  '𐽋' => 220,
+  '𐽌' => 230,
+  '𐽍' => 220,
+  '𐽎' => 220,
+  '𐽏' => 220,
+  '𐽐' => 220,
+  '𑁆' => 9,
+  '𑁿' => 9,
+  '𑂹' => 9,
+  '𑂺' => 7,
+  '𑄀' => 230,
+  '𑄁' => 230,
+  '𑄂' => 230,
+  '𑄳' => 9,
+  '𑄴' => 9,
+  '𑅳' => 7,
+  '𑇀' => 9,
+  '𑇊' => 7,
+  '𑈵' => 9,
+  '𑈶' => 7,
+  '𑋩' => 7,
+  '𑋪' => 9,
+  '𑌻' => 7,
+  '𑌼' => 7,
+  '𑍍' => 9,
+  '𑍦' => 230,
+  '𑍧' => 230,
+  '𑍨' => 230,
+  '𑍩' => 230,
+  '𑍪' => 230,
+  '𑍫' => 230,
+  '𑍬' => 230,
+  '𑍰' => 230,
+  '𑍱' => 230,
+  '𑍲' => 230,
+  '𑍳' => 230,
+  '𑍴' => 230,
+  '𑑂' => 9,
+  '𑑆' => 7,
+  '𑑞' => 230,
+  '𑓂' => 9,
+  '𑓃' => 7,
+  '𑖿' => 9,
+  '𑗀' => 7,
+  '𑘿' => 9,
+  '𑚶' => 9,
+  '𑚷' => 7,
+  '𑜫' => 9,
+  '𑠹' => 9,
+  '𑠺' => 7,
+  '𑤽' => 9,
+  '𑤾' => 9,
+  '𑥃' => 7,
+  '𑧠' => 9,
+  '𑨴' => 9,
+  '𑩇' => 9,
+  '𑪙' => 9,
+  '𑰿' => 9,
+  '𑵂' => 7,
+  '𑵄' => 9,
+  '𑵅' => 9,
+  '𑶗' => 9,
+  '𖫰' => 1,
+  '𖫱' => 1,
+  '𖫲' => 1,
+  '𖫳' => 1,
+  '𖫴' => 1,
+  '𖬰' => 230,
+  '𖬱' => 230,
+  '𖬲' => 230,
+  '𖬳' => 230,
+  '𖬴' => 230,
+  '𖬵' => 230,
+  '𖬶' => 230,
+  '𖿰' => 6,
+  '𖿱' => 6,
+  '𛲞' => 1,
+  '𝅥' => 216,
+  '𝅦' => 216,
+  '𝅧' => 1,
+  '𝅨' => 1,
+  '𝅩' => 1,
+  '𝅭' => 226,
+  '𝅮' => 216,
+  '𝅯' => 216,
+  '𝅰' => 216,
+  '𝅱' => 216,
+  '𝅲' => 216,
+  '𝅻' => 220,
+  '𝅼' => 220,
+  '𝅽' => 220,
+  '𝅾' => 220,
+  '𝅿' => 220,
+  '𝆀' => 220,
+  '𝆁' => 220,
+  '𝆂' => 220,
+  '𝆅' => 230,
+  '𝆆' => 230,
+  '𝆇' => 230,
+  '𝆈' => 230,
+  '𝆉' => 230,
+  '𝆊' => 220,
+  '𝆋' => 220,
+  '𝆪' => 230,
+  '𝆫' => 230,
+  '𝆬' => 230,
+  '𝆭' => 230,
+  '𝉂' => 230,
+  '𝉃' => 230,
+  '𝉄' => 230,
+  '𞀀' => 230,
+  '𞀁' => 230,
+  '𞀂' => 230,
+  '𞀃' => 230,
+  '𞀄' => 230,
+  '𞀅' => 230,
+  '𞀆' => 230,
+  '𞀈' => 230,
+  '𞀉' => 230,
+  '𞀊' => 230,
+  '𞀋' => 230,
+  '𞀌' => 230,
+  '𞀍' => 230,
+  '𞀎' => 230,
+  '𞀏' => 230,
+  '𞀐' => 230,
+  '𞀑' => 230,
+  '𞀒' => 230,
+  '𞀓' => 230,
+  '𞀔' => 230,
+  '𞀕' => 230,
+  '𞀖' => 230,
+  '𞀗' => 230,
+  '𞀘' => 230,
+  '𞀛' => 230,
+  '𞀜' => 230,
+  '𞀝' => 230,
+  '𞀞' => 230,
+  '𞀟' => 230,
+  '𞀠' => 230,
+  '𞀡' => 230,
+  '𞀣' => 230,
+  '𞀤' => 230,
+  '𞀦' => 230,
+  '𞀧' => 230,
+  '𞀨' => 230,
+  '𞀩' => 230,
+  '𞀪' => 230,
+  '𞄰' => 230,
+  '𞄱' => 230,
+  '𞄲' => 230,
+  '𞄳' => 230,
+  '𞄴' => 230,
+  '𞄵' => 230,
+  '𞄶' => 230,
+  '𞋬' => 230,
+  '𞋭' => 230,
+  '𞋮' => 230,
+  '𞋯' => 230,
+  '𞣐' => 220,
+  '𞣑' => 220,
+  '𞣒' => 220,
+  '𞣓' => 220,
+  '𞣔' => 220,
+  '𞣕' => 220,
+  '𞣖' => 220,
+  '𞥄' => 230,
+  '𞥅' => 230,
+  '𞥆' => 230,
+  '𞥇' => 230,
+  '𞥈' => 230,
+  '𞥉' => 230,
+  '𞥊' => 7,
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php
new file mode 100644
index 000000000..157490289
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php
@@ -0,0 +1,3695 @@
+<?php
+
+return array (
+  ' ' => ' ',
+  '¨' => ' ̈',
+  'ª' => 'a',
+  '¯' => ' ̄',
+  '²' => '2',
+  '³' => '3',
+  '´' => ' ́',
+  'µ' => 'μ',
+  '¸' => ' ̧',
+  '¹' => '1',
+  'º' => 'o',
+  '¼' => '1⁄4',
+  '½' => '1⁄2',
+  '¾' => '3⁄4',
+  'IJ' => 'IJ',
+  'ij' => 'ij',
+  'Ŀ' => 'L·',
+  'ŀ' => 'l·',
+  'ʼn' => 'ʼn',
+  'ſ' => 's',
+  'DŽ' => 'DŽ',
+  'Dž' => 'Dž',
+  'dž' => 'dž',
+  'LJ' => 'LJ',
+  'Lj' => 'Lj',
+  'lj' => 'lj',
+  'NJ' => 'NJ',
+  'Nj' => 'Nj',
+  'nj' => 'nj',
+  'DZ' => 'DZ',
+  'Dz' => 'Dz',
+  'dz' => 'dz',
+  'ʰ' => 'h',
+  'ʱ' => 'ɦ',
+  'ʲ' => 'j',
+  'ʳ' => 'r',
+  'ʴ' => 'ɹ',
+  'ʵ' => 'ɻ',
+  'ʶ' => 'ʁ',
+  'ʷ' => 'w',
+  'ʸ' => 'y',
+  '˘' => ' ̆',
+  '˙' => ' ̇',
+  '˚' => ' ̊',
+  '˛' => ' ̨',
+  '˜' => ' ̃',
+  '˝' => ' ̋',
+  'ˠ' => 'ɣ',
+  'ˡ' => 'l',
+  'ˢ' => 's',
+  'ˣ' => 'x',
+  'ˤ' => 'ʕ',
+  'ͺ' => ' ͅ',
+  '΄' => ' ́',
+  '΅' => ' ̈́',
+  'ϐ' => 'β',
+  'ϑ' => 'θ',
+  'ϒ' => 'Υ',
+  'ϓ' => 'Ύ',
+  'ϔ' => 'Ϋ',
+  'ϕ' => 'φ',
+  'ϖ' => 'π',
+  'ϰ' => 'κ',
+  'ϱ' => 'ρ',
+  'ϲ' => 'ς',
+  'ϴ' => 'Θ',
+  'ϵ' => 'ε',
+  'Ϲ' => 'Σ',
+  'և' => 'եւ',
+  'ٵ' => 'اٴ',
+  'ٶ' => 'وٴ',
+  'ٷ' => 'ۇٴ',
+  'ٸ' => 'يٴ',
+  'ำ' => 'ํา',
+  'ຳ' => 'ໍາ',
+  'ໜ' => 'ຫນ',
+  'ໝ' => 'ຫມ',
+  '༌' => '་',
+  'ཷ' => 'ྲཱྀ',
+  'ཹ' => 'ླཱྀ',
+  'ჼ' => 'ნ',
+  'ᴬ' => 'A',
+  'ᴭ' => 'Æ',
+  'ᴮ' => 'B',
+  'ᴰ' => 'D',
+  'ᴱ' => 'E',
+  'ᴲ' => 'Ǝ',
+  'ᴳ' => 'G',
+  'ᴴ' => 'H',
+  'ᴵ' => 'I',
+  'ᴶ' => 'J',
+  'ᴷ' => 'K',
+  'ᴸ' => 'L',
+  'ᴹ' => 'M',
+  'ᴺ' => 'N',
+  'ᴼ' => 'O',
+  'ᴽ' => 'Ȣ',
+  'ᴾ' => 'P',
+  'ᴿ' => 'R',
+  'ᵀ' => 'T',
+  'ᵁ' => 'U',
+  'ᵂ' => 'W',
+  'ᵃ' => 'a',
+  'ᵄ' => 'ɐ',
+  'ᵅ' => 'ɑ',
+  'ᵆ' => 'ᴂ',
+  'ᵇ' => 'b',
+  'ᵈ' => 'd',
+  'ᵉ' => 'e',
+  'ᵊ' => 'ə',
+  'ᵋ' => 'ɛ',
+  'ᵌ' => 'ɜ',
+  'ᵍ' => 'g',
+  'ᵏ' => 'k',
+  'ᵐ' => 'm',
+  'ᵑ' => 'ŋ',
+  'ᵒ' => 'o',
+  'ᵓ' => 'ɔ',
+  'ᵔ' => 'ᴖ',
+  'ᵕ' => 'ᴗ',
+  'ᵖ' => 'p',
+  'ᵗ' => 't',
+  'ᵘ' => 'u',
+  'ᵙ' => 'ᴝ',
+  'ᵚ' => 'ɯ',
+  'ᵛ' => 'v',
+  'ᵜ' => 'ᴥ',
+  'ᵝ' => 'β',
+  'ᵞ' => 'γ',
+  'ᵟ' => 'δ',
+  'ᵠ' => 'φ',
+  'ᵡ' => 'χ',
+  'ᵢ' => 'i',
+  'ᵣ' => 'r',
+  'ᵤ' => 'u',
+  'ᵥ' => 'v',
+  'ᵦ' => 'β',
+  'ᵧ' => 'γ',
+  'ᵨ' => 'ρ',
+  'ᵩ' => 'φ',
+  'ᵪ' => 'χ',
+  'ᵸ' => 'н',
+  'ᶛ' => 'ɒ',
+  'ᶜ' => 'c',
+  'ᶝ' => 'ɕ',
+  'ᶞ' => 'ð',
+  'ᶟ' => 'ɜ',
+  'ᶠ' => 'f',
+  'ᶡ' => 'ɟ',
+  'ᶢ' => 'ɡ',
+  'ᶣ' => 'ɥ',
+  'ᶤ' => 'ɨ',
+  'ᶥ' => 'ɩ',
+  'ᶦ' => 'ɪ',
+  'ᶧ' => 'ᵻ',
+  'ᶨ' => 'ʝ',
+  'ᶩ' => 'ɭ',
+  'ᶪ' => 'ᶅ',
+  'ᶫ' => 'ʟ',
+  'ᶬ' => 'ɱ',
+  'ᶭ' => 'ɰ',
+  'ᶮ' => 'ɲ',
+  'ᶯ' => 'ɳ',
+  'ᶰ' => 'ɴ',
+  'ᶱ' => 'ɵ',
+  'ᶲ' => 'ɸ',
+  'ᶳ' => 'ʂ',
+  'ᶴ' => 'ʃ',
+  'ᶵ' => 'ƫ',
+  'ᶶ' => 'ʉ',
+  'ᶷ' => 'ʊ',
+  'ᶸ' => 'ᴜ',
+  'ᶹ' => 'ʋ',
+  'ᶺ' => 'ʌ',
+  'ᶻ' => 'z',
+  'ᶼ' => 'ʐ',
+  'ᶽ' => 'ʑ',
+  'ᶾ' => 'ʒ',
+  'ᶿ' => 'θ',
+  'ẚ' => 'aʾ',
+  'ẛ' => 'ṡ',
+  '᾽' => ' ̓',
+  '᾿' => ' ̓',
+  '῀' => ' ͂',
+  '῁' => ' ̈͂',
+  '῍' => ' ̓̀',
+  '῎' => ' ̓́',
+  '῏' => ' ̓͂',
+  '῝' => ' ̔̀',
+  '῞' => ' ̔́',
+  '῟' => ' ̔͂',
+  '῭' => ' ̈̀',
+  '΅' => ' ̈́',
+  '´' => ' ́',
+  '῾' => ' ̔',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  '‑' => '‐',
+  '‗' => ' ̳',
+  '․' => '.',
+  '‥' => '..',
+  '…' => '...',
+  ' ' => ' ',
+  '″' => '′′',
+  '‴' => '′′′',
+  '‶' => '‵‵',
+  '‷' => '‵‵‵',
+  '‼' => '!!',
+  '‾' => ' ̅',
+  '⁇' => '??',
+  '⁈' => '?!',
+  '⁉' => '!?',
+  '⁗' => '′′′′',
+  ' ' => ' ',
+  '⁰' => '0',
+  'ⁱ' => 'i',
+  '⁴' => '4',
+  '⁵' => '5',
+  '⁶' => '6',
+  '⁷' => '7',
+  '⁸' => '8',
+  '⁹' => '9',
+  '⁺' => '+',
+  '⁻' => '−',
+  '⁼' => '=',
+  '⁽' => '(',
+  '⁾' => ')',
+  'ⁿ' => 'n',
+  '₀' => '0',
+  '₁' => '1',
+  '₂' => '2',
+  '₃' => '3',
+  '₄' => '4',
+  '₅' => '5',
+  '₆' => '6',
+  '₇' => '7',
+  '₈' => '8',
+  '₉' => '9',
+  '₊' => '+',
+  '₋' => '−',
+  '₌' => '=',
+  '₍' => '(',
+  '₎' => ')',
+  'ₐ' => 'a',
+  'ₑ' => 'e',
+  'ₒ' => 'o',
+  'ₓ' => 'x',
+  'ₔ' => 'ə',
+  'ₕ' => 'h',
+  'ₖ' => 'k',
+  'ₗ' => 'l',
+  'ₘ' => 'm',
+  'ₙ' => 'n',
+  'ₚ' => 'p',
+  'ₛ' => 's',
+  'ₜ' => 't',
+  '₨' => 'Rs',
+  '℀' => 'a/c',
+  '℁' => 'a/s',
+  'ℂ' => 'C',
+  '℃' => '°C',
+  '℅' => 'c/o',
+  '℆' => 'c/u',
+  'ℇ' => 'Ɛ',
+  '℉' => '°F',
+  'ℊ' => 'g',
+  'ℋ' => 'H',
+  'ℌ' => 'H',
+  'ℍ' => 'H',
+  'ℎ' => 'h',
+  'ℏ' => 'ħ',
+  'ℐ' => 'I',
+  'ℑ' => 'I',
+  'ℒ' => 'L',
+  'ℓ' => 'l',
+  'ℕ' => 'N',
+  '№' => 'No',
+  'ℙ' => 'P',
+  'ℚ' => 'Q',
+  'ℛ' => 'R',
+  'ℜ' => 'R',
+  'ℝ' => 'R',
+  '℠' => 'SM',
+  '℡' => 'TEL',
+  '™' => 'TM',
+  'ℤ' => 'Z',
+  'ℨ' => 'Z',
+  'ℬ' => 'B',
+  'ℭ' => 'C',
+  'ℯ' => 'e',
+  'ℰ' => 'E',
+  'ℱ' => 'F',
+  'ℳ' => 'M',
+  'ℴ' => 'o',
+  'ℵ' => 'א',
+  'ℶ' => 'ב',
+  'ℷ' => 'ג',
+  'ℸ' => 'ד',
+  'ℹ' => 'i',
+  '℻' => 'FAX',
+  'ℼ' => 'π',
+  'ℽ' => 'γ',
+  'ℾ' => 'Γ',
+  'ℿ' => 'Π',
+  '⅀' => '∑',
+  'ⅅ' => 'D',
+  'ⅆ' => 'd',
+  'ⅇ' => 'e',
+  'ⅈ' => 'i',
+  'ⅉ' => 'j',
+  '⅐' => '1⁄7',
+  '⅑' => '1⁄9',
+  '⅒' => '1⁄10',
+  '⅓' => '1⁄3',
+  '⅔' => '2⁄3',
+  '⅕' => '1⁄5',
+  '⅖' => '2⁄5',
+  '⅗' => '3⁄5',
+  '⅘' => '4⁄5',
+  '⅙' => '1⁄6',
+  '⅚' => '5⁄6',
+  '⅛' => '1⁄8',
+  '⅜' => '3⁄8',
+  '⅝' => '5⁄8',
+  '⅞' => '7⁄8',
+  '⅟' => '1⁄',
+  'Ⅰ' => 'I',
+  'Ⅱ' => 'II',
+  'Ⅲ' => 'III',
+  'Ⅳ' => 'IV',
+  'Ⅴ' => 'V',
+  'Ⅵ' => 'VI',
+  'Ⅶ' => 'VII',
+  'Ⅷ' => 'VIII',
+  'Ⅸ' => 'IX',
+  'Ⅹ' => 'X',
+  'Ⅺ' => 'XI',
+  'Ⅻ' => 'XII',
+  'Ⅼ' => 'L',
+  'Ⅽ' => 'C',
+  'Ⅾ' => 'D',
+  'Ⅿ' => 'M',
+  'ⅰ' => 'i',
+  'ⅱ' => 'ii',
+  'ⅲ' => 'iii',
+  'ⅳ' => 'iv',
+  'ⅴ' => 'v',
+  'ⅵ' => 'vi',
+  'ⅶ' => 'vii',
+  'ⅷ' => 'viii',
+  'ⅸ' => 'ix',
+  'ⅹ' => 'x',
+  'ⅺ' => 'xi',
+  'ⅻ' => 'xii',
+  'ⅼ' => 'l',
+  'ⅽ' => 'c',
+  'ⅾ' => 'd',
+  'ⅿ' => 'm',
+  '↉' => '0⁄3',
+  '∬' => '∫∫',
+  '∭' => '∫∫∫',
+  '∯' => '∮∮',
+  '∰' => '∮∮∮',
+  '①' => '1',
+  '②' => '2',
+  '③' => '3',
+  '④' => '4',
+  '⑤' => '5',
+  '⑥' => '6',
+  '⑦' => '7',
+  '⑧' => '8',
+  '⑨' => '9',
+  '⑩' => '10',
+  '⑪' => '11',
+  '⑫' => '12',
+  '⑬' => '13',
+  '⑭' => '14',
+  '⑮' => '15',
+  '⑯' => '16',
+  '⑰' => '17',
+  '⑱' => '18',
+  '⑲' => '19',
+  '⑳' => '20',
+  '⑴' => '(1)',
+  '⑵' => '(2)',
+  '⑶' => '(3)',
+  '⑷' => '(4)',
+  '⑸' => '(5)',
+  '⑹' => '(6)',
+  '⑺' => '(7)',
+  '⑻' => '(8)',
+  '⑼' => '(9)',
+  '⑽' => '(10)',
+  '⑾' => '(11)',
+  '⑿' => '(12)',
+  '⒀' => '(13)',
+  '⒁' => '(14)',
+  '⒂' => '(15)',
+  '⒃' => '(16)',
+  '⒄' => '(17)',
+  '⒅' => '(18)',
+  '⒆' => '(19)',
+  '⒇' => '(20)',
+  '⒈' => '1.',
+  '⒉' => '2.',
+  '⒊' => '3.',
+  '⒋' => '4.',
+  '⒌' => '5.',
+  '⒍' => '6.',
+  '⒎' => '7.',
+  '⒏' => '8.',
+  '⒐' => '9.',
+  '⒑' => '10.',
+  '⒒' => '11.',
+  '⒓' => '12.',
+  '⒔' => '13.',
+  '⒕' => '14.',
+  '⒖' => '15.',
+  '⒗' => '16.',
+  '⒘' => '17.',
+  '⒙' => '18.',
+  '⒚' => '19.',
+  '⒛' => '20.',
+  '⒜' => '(a)',
+  '⒝' => '(b)',
+  '⒞' => '(c)',
+  '⒟' => '(d)',
+  '⒠' => '(e)',
+  '⒡' => '(f)',
+  '⒢' => '(g)',
+  '⒣' => '(h)',
+  '⒤' => '(i)',
+  '⒥' => '(j)',
+  '⒦' => '(k)',
+  '⒧' => '(l)',
+  '⒨' => '(m)',
+  '⒩' => '(n)',
+  '⒪' => '(o)',
+  '⒫' => '(p)',
+  '⒬' => '(q)',
+  '⒭' => '(r)',
+  '⒮' => '(s)',
+  '⒯' => '(t)',
+  '⒰' => '(u)',
+  '⒱' => '(v)',
+  '⒲' => '(w)',
+  '⒳' => '(x)',
+  '⒴' => '(y)',
+  '⒵' => '(z)',
+  'Ⓐ' => 'A',
+  'Ⓑ' => 'B',
+  'Ⓒ' => 'C',
+  'Ⓓ' => 'D',
+  'Ⓔ' => 'E',
+  'Ⓕ' => 'F',
+  'Ⓖ' => 'G',
+  'Ⓗ' => 'H',
+  'Ⓘ' => 'I',
+  'Ⓙ' => 'J',
+  'Ⓚ' => 'K',
+  'Ⓛ' => 'L',
+  'Ⓜ' => 'M',
+  'Ⓝ' => 'N',
+  'Ⓞ' => 'O',
+  'Ⓟ' => 'P',
+  'Ⓠ' => 'Q',
+  'Ⓡ' => 'R',
+  'Ⓢ' => 'S',
+  'Ⓣ' => 'T',
+  'Ⓤ' => 'U',
+  'Ⓥ' => 'V',
+  'Ⓦ' => 'W',
+  'Ⓧ' => 'X',
+  'Ⓨ' => 'Y',
+  'Ⓩ' => 'Z',
+  'ⓐ' => 'a',
+  'ⓑ' => 'b',
+  'ⓒ' => 'c',
+  'ⓓ' => 'd',
+  'ⓔ' => 'e',
+  'ⓕ' => 'f',
+  'ⓖ' => 'g',
+  'ⓗ' => 'h',
+  'ⓘ' => 'i',
+  'ⓙ' => 'j',
+  'ⓚ' => 'k',
+  'ⓛ' => 'l',
+  'ⓜ' => 'm',
+  'ⓝ' => 'n',
+  'ⓞ' => 'o',
+  'ⓟ' => 'p',
+  'ⓠ' => 'q',
+  'ⓡ' => 'r',
+  'ⓢ' => 's',
+  'ⓣ' => 't',
+  'ⓤ' => 'u',
+  'ⓥ' => 'v',
+  'ⓦ' => 'w',
+  'ⓧ' => 'x',
+  'ⓨ' => 'y',
+  'ⓩ' => 'z',
+  '⓪' => '0',
+  '⨌' => '∫∫∫∫',
+  '⩴' => '::=',
+  '⩵' => '==',
+  '⩶' => '===',
+  'ⱼ' => 'j',
+  'ⱽ' => 'V',
+  'ⵯ' => 'ⵡ',
+  '⺟' => '母',
+  '⻳' => '龟',
+  '⼀' => '一',
+  '⼁' => '丨',
+  '⼂' => '丶',
+  '⼃' => '丿',
+  '⼄' => '乙',
+  '⼅' => '亅',
+  '⼆' => '二',
+  '⼇' => '亠',
+  '⼈' => '人',
+  '⼉' => '儿',
+  '⼊' => '入',
+  '⼋' => '八',
+  '⼌' => '冂',
+  '⼍' => '冖',
+  '⼎' => '冫',
+  '⼏' => '几',
+  '⼐' => '凵',
+  '⼑' => '刀',
+  '⼒' => '力',
+  '⼓' => '勹',
+  '⼔' => '匕',
+  '⼕' => '匚',
+  '⼖' => '匸',
+  '⼗' => '十',
+  '⼘' => '卜',
+  '⼙' => '卩',
+  '⼚' => '厂',
+  '⼛' => '厶',
+  '⼜' => '又',
+  '⼝' => '口',
+  '⼞' => '囗',
+  '⼟' => '土',
+  '⼠' => '士',
+  '⼡' => '夂',
+  '⼢' => '夊',
+  '⼣' => '夕',
+  '⼤' => '大',
+  '⼥' => '女',
+  '⼦' => '子',
+  '⼧' => '宀',
+  '⼨' => '寸',
+  '⼩' => '小',
+  '⼪' => '尢',
+  '⼫' => '尸',
+  '⼬' => '屮',
+  '⼭' => '山',
+  '⼮' => '巛',
+  '⼯' => '工',
+  '⼰' => '己',
+  '⼱' => '巾',
+  '⼲' => '干',
+  '⼳' => '幺',
+  '⼴' => '广',
+  '⼵' => '廴',
+  '⼶' => '廾',
+  '⼷' => '弋',
+  '⼸' => '弓',
+  '⼹' => '彐',
+  '⼺' => '彡',
+  '⼻' => '彳',
+  '⼼' => '心',
+  '⼽' => '戈',
+  '⼾' => '戶',
+  '⼿' => '手',
+  '⽀' => '支',
+  '⽁' => '攴',
+  '⽂' => '文',
+  '⽃' => '斗',
+  '⽄' => '斤',
+  '⽅' => '方',
+  '⽆' => '无',
+  '⽇' => '日',
+  '⽈' => '曰',
+  '⽉' => '月',
+  '⽊' => '木',
+  '⽋' => '欠',
+  '⽌' => '止',
+  '⽍' => '歹',
+  '⽎' => '殳',
+  '⽏' => '毋',
+  '⽐' => '比',
+  '⽑' => '毛',
+  '⽒' => '氏',
+  '⽓' => '气',
+  '⽔' => '水',
+  '⽕' => '火',
+  '⽖' => '爪',
+  '⽗' => '父',
+  '⽘' => '爻',
+  '⽙' => '爿',
+  '⽚' => '片',
+  '⽛' => '牙',
+  '⽜' => '牛',
+  '⽝' => '犬',
+  '⽞' => '玄',
+  '⽟' => '玉',
+  '⽠' => '瓜',
+  '⽡' => '瓦',
+  '⽢' => '甘',
+  '⽣' => '生',
+  '⽤' => '用',
+  '⽥' => '田',
+  '⽦' => '疋',
+  '⽧' => '疒',
+  '⽨' => '癶',
+  '⽩' => '白',
+  '⽪' => '皮',
+  '⽫' => '皿',
+  '⽬' => '目',
+  '⽭' => '矛',
+  '⽮' => '矢',
+  '⽯' => '石',
+  '⽰' => '示',
+  '⽱' => '禸',
+  '⽲' => '禾',
+  '⽳' => '穴',
+  '⽴' => '立',
+  '⽵' => '竹',
+  '⽶' => '米',
+  '⽷' => '糸',
+  '⽸' => '缶',
+  '⽹' => '网',
+  '⽺' => '羊',
+  '⽻' => '羽',
+  '⽼' => '老',
+  '⽽' => '而',
+  '⽾' => '耒',
+  '⽿' => '耳',
+  '⾀' => '聿',
+  '⾁' => '肉',
+  '⾂' => '臣',
+  '⾃' => '自',
+  '⾄' => '至',
+  '⾅' => '臼',
+  '⾆' => '舌',
+  '⾇' => '舛',
+  '⾈' => '舟',
+  '⾉' => '艮',
+  '⾊' => '色',
+  '⾋' => '艸',
+  '⾌' => '虍',
+  '⾍' => '虫',
+  '⾎' => '血',
+  '⾏' => '行',
+  '⾐' => '衣',
+  '⾑' => '襾',
+  '⾒' => '見',
+  '⾓' => '角',
+  '⾔' => '言',
+  '⾕' => '谷',
+  '⾖' => '豆',
+  '⾗' => '豕',
+  '⾘' => '豸',
+  '⾙' => '貝',
+  '⾚' => '赤',
+  '⾛' => '走',
+  '⾜' => '足',
+  '⾝' => '身',
+  '⾞' => '車',
+  '⾟' => '辛',
+  '⾠' => '辰',
+  '⾡' => '辵',
+  '⾢' => '邑',
+  '⾣' => '酉',
+  '⾤' => '釆',
+  '⾥' => '里',
+  '⾦' => '金',
+  '⾧' => '長',
+  '⾨' => '門',
+  '⾩' => '阜',
+  '⾪' => '隶',
+  '⾫' => '隹',
+  '⾬' => '雨',
+  '⾭' => '靑',
+  '⾮' => '非',
+  '⾯' => '面',
+  '⾰' => '革',
+  '⾱' => '韋',
+  '⾲' => '韭',
+  '⾳' => '音',
+  '⾴' => '頁',
+  '⾵' => '風',
+  '⾶' => '飛',
+  '⾷' => '食',
+  '⾸' => '首',
+  '⾹' => '香',
+  '⾺' => '馬',
+  '⾻' => '骨',
+  '⾼' => '高',
+  '⾽' => '髟',
+  '⾾' => '鬥',
+  '⾿' => '鬯',
+  '⿀' => '鬲',
+  '⿁' => '鬼',
+  '⿂' => '魚',
+  '⿃' => '鳥',
+  '⿄' => '鹵',
+  '⿅' => '鹿',
+  '⿆' => '麥',
+  '⿇' => '麻',
+  '⿈' => '黃',
+  '⿉' => '黍',
+  '⿊' => '黑',
+  '⿋' => '黹',
+  '⿌' => '黽',
+  '⿍' => '鼎',
+  '⿎' => '鼓',
+  '⿏' => '鼠',
+  '⿐' => '鼻',
+  '⿑' => '齊',
+  '⿒' => '齒',
+  '⿓' => '龍',
+  '⿔' => '龜',
+  '⿕' => '龠',
+  '　' => ' ',
+  '〶' => '〒',
+  '〸' => '十',
+  '〹' => '卄',
+  '〺' => '卅',
+  '゛' => ' ゙',
+  '゜' => ' ゚',
+  'ゟ' => 'より',
+  'ヿ' => 'コト',
+  'ㄱ' => 'ᄀ',
+  'ㄲ' => 'ᄁ',
+  'ㄳ' => 'ᆪ',
+  'ㄴ' => 'ᄂ',
+  'ㄵ' => 'ᆬ',
+  'ㄶ' => 'ᆭ',
+  'ㄷ' => 'ᄃ',
+  'ㄸ' => 'ᄄ',
+  'ㄹ' => 'ᄅ',
+  'ㄺ' => 'ᆰ',
+  'ㄻ' => 'ᆱ',
+  'ㄼ' => 'ᆲ',
+  'ㄽ' => 'ᆳ',
+  'ㄾ' => 'ᆴ',
+  'ㄿ' => 'ᆵ',
+  'ㅀ' => 'ᄚ',
+  'ㅁ' => 'ᄆ',
+  'ㅂ' => 'ᄇ',
+  'ㅃ' => 'ᄈ',
+  'ㅄ' => 'ᄡ',
+  'ㅅ' => 'ᄉ',
+  'ㅆ' => 'ᄊ',
+  'ㅇ' => 'ᄋ',
+  'ㅈ' => 'ᄌ',
+  'ㅉ' => 'ᄍ',
+  'ㅊ' => 'ᄎ',
+  'ㅋ' => 'ᄏ',
+  'ㅌ' => 'ᄐ',
+  'ㅍ' => 'ᄑ',
+  'ㅎ' => 'ᄒ',
+  'ㅏ' => 'ᅡ',
+  'ㅐ' => 'ᅢ',
+  'ㅑ' => 'ᅣ',
+  'ㅒ' => 'ᅤ',
+  'ㅓ' => 'ᅥ',
+  'ㅔ' => 'ᅦ',
+  'ㅕ' => 'ᅧ',
+  'ㅖ' => 'ᅨ',
+  'ㅗ' => 'ᅩ',
+  'ㅘ' => 'ᅪ',
+  'ㅙ' => 'ᅫ',
+  'ㅚ' => 'ᅬ',
+  'ㅛ' => 'ᅭ',
+  'ㅜ' => 'ᅮ',
+  'ㅝ' => 'ᅯ',
+  'ㅞ' => 'ᅰ',
+  'ㅟ' => 'ᅱ',
+  'ㅠ' => 'ᅲ',
+  'ㅡ' => 'ᅳ',
+  'ㅢ' => 'ᅴ',
+  'ㅣ' => 'ᅵ',
+  'ㅤ' => 'ᅠ',
+  'ㅥ' => 'ᄔ',
+  'ㅦ' => 'ᄕ',
+  'ㅧ' => 'ᇇ',
+  'ㅨ' => 'ᇈ',
+  'ㅩ' => 'ᇌ',
+  'ㅪ' => 'ᇎ',
+  'ㅫ' => 'ᇓ',
+  'ㅬ' => 'ᇗ',
+  'ㅭ' => 'ᇙ',
+  'ㅮ' => 'ᄜ',
+  'ㅯ' => 'ᇝ',
+  'ㅰ' => 'ᇟ',
+  'ㅱ' => 'ᄝ',
+  'ㅲ' => 'ᄞ',
+  'ㅳ' => 'ᄠ',
+  'ㅴ' => 'ᄢ',
+  'ㅵ' => 'ᄣ',
+  'ㅶ' => 'ᄧ',
+  'ㅷ' => 'ᄩ',
+  'ㅸ' => 'ᄫ',
+  'ㅹ' => 'ᄬ',
+  'ㅺ' => 'ᄭ',
+  'ㅻ' => 'ᄮ',
+  'ㅼ' => 'ᄯ',
+  'ㅽ' => 'ᄲ',
+  'ㅾ' => 'ᄶ',
+  'ㅿ' => 'ᅀ',
+  'ㆀ' => 'ᅇ',
+  'ㆁ' => 'ᅌ',
+  'ㆂ' => 'ᇱ',
+  'ㆃ' => 'ᇲ',
+  'ㆄ' => 'ᅗ',
+  'ㆅ' => 'ᅘ',
+  'ㆆ' => 'ᅙ',
+  'ㆇ' => 'ᆄ',
+  'ㆈ' => 'ᆅ',
+  'ㆉ' => 'ᆈ',
+  'ㆊ' => 'ᆑ',
+  'ㆋ' => 'ᆒ',
+  'ㆌ' => 'ᆔ',
+  'ㆍ' => 'ᆞ',
+  'ㆎ' => 'ᆡ',
+  '㆒' => '一',
+  '㆓' => '二',
+  '㆔' => '三',
+  '㆕' => '四',
+  '㆖' => '上',
+  '㆗' => '中',
+  '㆘' => '下',
+  '㆙' => '甲',
+  '㆚' => '乙',
+  '㆛' => '丙',
+  '㆜' => '丁',
+  '㆝' => '天',
+  '㆞' => '地',
+  '㆟' => '人',
+  '㈀' => '(ᄀ)',
+  '㈁' => '(ᄂ)',
+  '㈂' => '(ᄃ)',
+  '㈃' => '(ᄅ)',
+  '㈄' => '(ᄆ)',
+  '㈅' => '(ᄇ)',
+  '㈆' => '(ᄉ)',
+  '㈇' => '(ᄋ)',
+  '㈈' => '(ᄌ)',
+  '㈉' => '(ᄎ)',
+  '㈊' => '(ᄏ)',
+  '㈋' => '(ᄐ)',
+  '㈌' => '(ᄑ)',
+  '㈍' => '(ᄒ)',
+  '㈎' => '(가)',
+  '㈏' => '(나)',
+  '㈐' => '(다)',
+  '㈑' => '(라)',
+  '㈒' => '(마)',
+  '㈓' => '(바)',
+  '㈔' => '(사)',
+  '㈕' => '(아)',
+  '㈖' => '(자)',
+  '㈗' => '(차)',
+  '㈘' => '(카)',
+  '㈙' => '(타)',
+  '㈚' => '(파)',
+  '㈛' => '(하)',
+  '㈜' => '(주)',
+  '㈝' => '(오전)',
+  '㈞' => '(오후)',
+  '㈠' => '(一)',
+  '㈡' => '(二)',
+  '㈢' => '(三)',
+  '㈣' => '(四)',
+  '㈤' => '(五)',
+  '㈥' => '(六)',
+  '㈦' => '(七)',
+  '㈧' => '(八)',
+  '㈨' => '(九)',
+  '㈩' => '(十)',
+  '㈪' => '(月)',
+  '㈫' => '(火)',
+  '㈬' => '(水)',
+  '㈭' => '(木)',
+  '㈮' => '(金)',
+  '㈯' => '(土)',
+  '㈰' => '(日)',
+  '㈱' => '(株)',
+  '㈲' => '(有)',
+  '㈳' => '(社)',
+  '㈴' => '(名)',
+  '㈵' => '(特)',
+  '㈶' => '(財)',
+  '㈷' => '(祝)',
+  '㈸' => '(労)',
+  '㈹' => '(代)',
+  '㈺' => '(呼)',
+  '㈻' => '(学)',
+  '㈼' => '(監)',
+  '㈽' => '(企)',
+  '㈾' => '(資)',
+  '㈿' => '(協)',
+  '㉀' => '(祭)',
+  '㉁' => '(休)',
+  '㉂' => '(自)',
+  '㉃' => '(至)',
+  '㉄' => '問',
+  '㉅' => '幼',
+  '㉆' => '文',
+  '㉇' => '箏',
+  '㉐' => 'PTE',
+  '㉑' => '21',
+  '㉒' => '22',
+  '㉓' => '23',
+  '㉔' => '24',
+  '㉕' => '25',
+  '㉖' => '26',
+  '㉗' => '27',
+  '㉘' => '28',
+  '㉙' => '29',
+  '㉚' => '30',
+  '㉛' => '31',
+  '㉜' => '32',
+  '㉝' => '33',
+  '㉞' => '34',
+  '㉟' => '35',
+  '㉠' => 'ᄀ',
+  '㉡' => 'ᄂ',
+  '㉢' => 'ᄃ',
+  '㉣' => 'ᄅ',
+  '㉤' => 'ᄆ',
+  '㉥' => 'ᄇ',
+  '㉦' => 'ᄉ',
+  '㉧' => 'ᄋ',
+  '㉨' => 'ᄌ',
+  '㉩' => 'ᄎ',
+  '㉪' => 'ᄏ',
+  '㉫' => 'ᄐ',
+  '㉬' => 'ᄑ',
+  '㉭' => 'ᄒ',
+  '㉮' => '가',
+  '㉯' => '나',
+  '㉰' => '다',
+  '㉱' => '라',
+  '㉲' => '마',
+  '㉳' => '바',
+  '㉴' => '사',
+  '㉵' => '아',
+  '㉶' => '자',
+  '㉷' => '차',
+  '㉸' => '카',
+  '㉹' => '타',
+  '㉺' => '파',
+  '㉻' => '하',
+  '㉼' => '참고',
+  '㉽' => '주의',
+  '㉾' => '우',
+  '㊀' => '一',
+  '㊁' => '二',
+  '㊂' => '三',
+  '㊃' => '四',
+  '㊄' => '五',
+  '㊅' => '六',
+  '㊆' => '七',
+  '㊇' => '八',
+  '㊈' => '九',
+  '㊉' => '十',
+  '㊊' => '月',
+  '㊋' => '火',
+  '㊌' => '水',
+  '㊍' => '木',
+  '㊎' => '金',
+  '㊏' => '土',
+  '㊐' => '日',
+  '㊑' => '株',
+  '㊒' => '有',
+  '㊓' => '社',
+  '㊔' => '名',
+  '㊕' => '特',
+  '㊖' => '財',
+  '㊗' => '祝',
+  '㊘' => '労',
+  '㊙' => '秘',
+  '㊚' => '男',
+  '㊛' => '女',
+  '㊜' => '適',
+  '㊝' => '優',
+  '㊞' => '印',
+  '㊟' => '注',
+  '㊠' => '項',
+  '㊡' => '休',
+  '㊢' => '写',
+  '㊣' => '正',
+  '㊤' => '上',
+  '㊥' => '中',
+  '㊦' => '下',
+  '㊧' => '左',
+  '㊨' => '右',
+  '㊩' => '医',
+  '㊪' => '宗',
+  '㊫' => '学',
+  '㊬' => '監',
+  '㊭' => '企',
+  '㊮' => '資',
+  '㊯' => '協',
+  '㊰' => '夜',
+  '㊱' => '36',
+  '㊲' => '37',
+  '㊳' => '38',
+  '㊴' => '39',
+  '㊵' => '40',
+  '㊶' => '41',
+  '㊷' => '42',
+  '㊸' => '43',
+  '㊹' => '44',
+  '㊺' => '45',
+  '㊻' => '46',
+  '㊼' => '47',
+  '㊽' => '48',
+  '㊾' => '49',
+  '㊿' => '50',
+  '㋀' => '1月',
+  '㋁' => '2月',
+  '㋂' => '3月',
+  '㋃' => '4月',
+  '㋄' => '5月',
+  '㋅' => '6月',
+  '㋆' => '7月',
+  '㋇' => '8月',
+  '㋈' => '9月',
+  '㋉' => '10月',
+  '㋊' => '11月',
+  '㋋' => '12月',
+  '㋌' => 'Hg',
+  '㋍' => 'erg',
+  '㋎' => 'eV',
+  '㋏' => 'LTD',
+  '㋐' => 'ア',
+  '㋑' => 'イ',
+  '㋒' => 'ウ',
+  '㋓' => 'エ',
+  '㋔' => 'オ',
+  '㋕' => 'カ',
+  '㋖' => 'キ',
+  '㋗' => 'ク',
+  '㋘' => 'ケ',
+  '㋙' => 'コ',
+  '㋚' => 'サ',
+  '㋛' => 'シ',
+  '㋜' => 'ス',
+  '㋝' => 'セ',
+  '㋞' => 'ソ',
+  '㋟' => 'タ',
+  '㋠' => 'チ',
+  '㋡' => 'ツ',
+  '㋢' => 'テ',
+  '㋣' => 'ト',
+  '㋤' => 'ナ',
+  '㋥' => 'ニ',
+  '㋦' => 'ヌ',
+  '㋧' => 'ネ',
+  '㋨' => 'ノ',
+  '㋩' => 'ハ',
+  '㋪' => 'ヒ',
+  '㋫' => 'フ',
+  '㋬' => 'ヘ',
+  '㋭' => 'ホ',
+  '㋮' => 'マ',
+  '㋯' => 'ミ',
+  '㋰' => 'ム',
+  '㋱' => 'メ',
+  '㋲' => 'モ',
+  '㋳' => 'ヤ',
+  '㋴' => 'ユ',
+  '㋵' => 'ヨ',
+  '㋶' => 'ラ',
+  '㋷' => 'リ',
+  '㋸' => 'ル',
+  '㋹' => 'レ',
+  '㋺' => 'ロ',
+  '㋻' => 'ワ',
+  '㋼' => 'ヰ',
+  '㋽' => 'ヱ',
+  '㋾' => 'ヲ',
+  '㋿' => '令和',
+  '㌀' => 'アパート',
+  '㌁' => 'アルファ',
+  '㌂' => 'アンペア',
+  '㌃' => 'アール',
+  '㌄' => 'イニング',
+  '㌅' => 'インチ',
+  '㌆' => 'ウォン',
+  '㌇' => 'エスクード',
+  '㌈' => 'エーカー',
+  '㌉' => 'オンス',
+  '㌊' => 'オーム',
+  '㌋' => 'カイリ',
+  '㌌' => 'カラット',
+  '㌍' => 'カロリー',
+  '㌎' => 'ガロン',
+  '㌏' => 'ガンマ',
+  '㌐' => 'ギガ',
+  '㌑' => 'ギニー',
+  '㌒' => 'キュリー',
+  '㌓' => 'ギルダー',
+  '㌔' => 'キロ',
+  '㌕' => 'キログラム',
+  '㌖' => 'キロメートル',
+  '㌗' => 'キロワット',
+  '㌘' => 'グラム',
+  '㌙' => 'グラムトン',
+  '㌚' => 'クルゼイロ',
+  '㌛' => 'クローネ',
+  '㌜' => 'ケース',
+  '㌝' => 'コルナ',
+  '㌞' => 'コーポ',
+  '㌟' => 'サイクル',
+  '㌠' => 'サンチーム',
+  '㌡' => 'シリング',
+  '㌢' => 'センチ',
+  '㌣' => 'セント',
+  '㌤' => 'ダース',
+  '㌥' => 'デシ',
+  '㌦' => 'ドル',
+  '㌧' => 'トン',
+  '㌨' => 'ナノ',
+  '㌩' => 'ノット',
+  '㌪' => 'ハイツ',
+  '㌫' => 'パーセント',
+  '㌬' => 'パーツ',
+  '㌭' => 'バーレル',
+  '㌮' => 'ピアストル',
+  '㌯' => 'ピクル',
+  '㌰' => 'ピコ',
+  '㌱' => 'ビル',
+  '㌲' => 'ファラッド',
+  '㌳' => 'フィート',
+  '㌴' => 'ブッシェル',
+  '㌵' => 'フラン',
+  '㌶' => 'ヘクタール',
+  '㌷' => 'ペソ',
+  '㌸' => 'ペニヒ',
+  '㌹' => 'ヘルツ',
+  '㌺' => 'ペンス',
+  '㌻' => 'ページ',
+  '㌼' => 'ベータ',
+  '㌽' => 'ポイント',
+  '㌾' => 'ボルト',
+  '㌿' => 'ホン',
+  '㍀' => 'ポンド',
+  '㍁' => 'ホール',
+  '㍂' => 'ホーン',
+  '㍃' => 'マイクロ',
+  '㍄' => 'マイル',
+  '㍅' => 'マッハ',
+  '㍆' => 'マルク',
+  '㍇' => 'マンション',
+  '㍈' => 'ミクロン',
+  '㍉' => 'ミリ',
+  '㍊' => 'ミリバール',
+  '㍋' => 'メガ',
+  '㍌' => 'メガトン',
+  '㍍' => 'メートル',
+  '㍎' => 'ヤード',
+  '㍏' => 'ヤール',
+  '㍐' => 'ユアン',
+  '㍑' => 'リットル',
+  '㍒' => 'リラ',
+  '㍓' => 'ルピー',
+  '㍔' => 'ルーブル',
+  '㍕' => 'レム',
+  '㍖' => 'レントゲン',
+  '㍗' => 'ワット',
+  '㍘' => '0点',
+  '㍙' => '1点',
+  '㍚' => '2点',
+  '㍛' => '3点',
+  '㍜' => '4点',
+  '㍝' => '5点',
+  '㍞' => '6点',
+  '㍟' => '7点',
+  '㍠' => '8点',
+  '㍡' => '9点',
+  '㍢' => '10点',
+  '㍣' => '11点',
+  '㍤' => '12点',
+  '㍥' => '13点',
+  '㍦' => '14点',
+  '㍧' => '15点',
+  '㍨' => '16点',
+  '㍩' => '17点',
+  '㍪' => '18点',
+  '㍫' => '19点',
+  '㍬' => '20点',
+  '㍭' => '21点',
+  '㍮' => '22点',
+  '㍯' => '23点',
+  '㍰' => '24点',
+  '㍱' => 'hPa',
+  '㍲' => 'da',
+  '㍳' => 'AU',
+  '㍴' => 'bar',
+  '㍵' => 'oV',
+  '㍶' => 'pc',
+  '㍷' => 'dm',
+  '㍸' => 'dm2',
+  '㍹' => 'dm3',
+  '㍺' => 'IU',
+  '㍻' => '平成',
+  '㍼' => '昭和',
+  '㍽' => '大正',
+  '㍾' => '明治',
+  '㍿' => '株式会社',
+  '㎀' => 'pA',
+  '㎁' => 'nA',
+  '㎂' => 'μA',
+  '㎃' => 'mA',
+  '㎄' => 'kA',
+  '㎅' => 'KB',
+  '㎆' => 'MB',
+  '㎇' => 'GB',
+  '㎈' => 'cal',
+  '㎉' => 'kcal',
+  '㎊' => 'pF',
+  '㎋' => 'nF',
+  '㎌' => 'μF',
+  '㎍' => 'μg',
+  '㎎' => 'mg',
+  '㎏' => 'kg',
+  '㎐' => 'Hz',
+  '㎑' => 'kHz',
+  '㎒' => 'MHz',
+  '㎓' => 'GHz',
+  '㎔' => 'THz',
+  '㎕' => 'μl',
+  '㎖' => 'ml',
+  '㎗' => 'dl',
+  '㎘' => 'kl',
+  '㎙' => 'fm',
+  '㎚' => 'nm',
+  '㎛' => 'μm',
+  '㎜' => 'mm',
+  '㎝' => 'cm',
+  '㎞' => 'km',
+  '㎟' => 'mm2',
+  '㎠' => 'cm2',
+  '㎡' => 'm2',
+  '㎢' => 'km2',
+  '㎣' => 'mm3',
+  '㎤' => 'cm3',
+  '㎥' => 'm3',
+  '㎦' => 'km3',
+  '㎧' => 'm∕s',
+  '㎨' => 'm∕s2',
+  '㎩' => 'Pa',
+  '㎪' => 'kPa',
+  '㎫' => 'MPa',
+  '㎬' => 'GPa',
+  '㎭' => 'rad',
+  '㎮' => 'rad∕s',
+  '㎯' => 'rad∕s2',
+  '㎰' => 'ps',
+  '㎱' => 'ns',
+  '㎲' => 'μs',
+  '㎳' => 'ms',
+  '㎴' => 'pV',
+  '㎵' => 'nV',
+  '㎶' => 'μV',
+  '㎷' => 'mV',
+  '㎸' => 'kV',
+  '㎹' => 'MV',
+  '㎺' => 'pW',
+  '㎻' => 'nW',
+  '㎼' => 'μW',
+  '㎽' => 'mW',
+  '㎾' => 'kW',
+  '㎿' => 'MW',
+  '㏀' => 'kΩ',
+  '㏁' => 'MΩ',
+  '㏂' => 'a.m.',
+  '㏃' => 'Bq',
+  '㏄' => 'cc',
+  '㏅' => 'cd',
+  '㏆' => 'C∕kg',
+  '㏇' => 'Co.',
+  '㏈' => 'dB',
+  '㏉' => 'Gy',
+  '㏊' => 'ha',
+  '㏋' => 'HP',
+  '㏌' => 'in',
+  '㏍' => 'KK',
+  '㏎' => 'KM',
+  '㏏' => 'kt',
+  '㏐' => 'lm',
+  '㏑' => 'ln',
+  '㏒' => 'log',
+  '㏓' => 'lx',
+  '㏔' => 'mb',
+  '㏕' => 'mil',
+  '㏖' => 'mol',
+  '㏗' => 'PH',
+  '㏘' => 'p.m.',
+  '㏙' => 'PPM',
+  '㏚' => 'PR',
+  '㏛' => 'sr',
+  '㏜' => 'Sv',
+  '㏝' => 'Wb',
+  '㏞' => 'V∕m',
+  '㏟' => 'A∕m',
+  '㏠' => '1日',
+  '㏡' => '2日',
+  '㏢' => '3日',
+  '㏣' => '4日',
+  '㏤' => '5日',
+  '㏥' => '6日',
+  '㏦' => '7日',
+  '㏧' => '8日',
+  '㏨' => '9日',
+  '㏩' => '10日',
+  '㏪' => '11日',
+  '㏫' => '12日',
+  '㏬' => '13日',
+  '㏭' => '14日',
+  '㏮' => '15日',
+  '㏯' => '16日',
+  '㏰' => '17日',
+  '㏱' => '18日',
+  '㏲' => '19日',
+  '㏳' => '20日',
+  '㏴' => '21日',
+  '㏵' => '22日',
+  '㏶' => '23日',
+  '㏷' => '24日',
+  '㏸' => '25日',
+  '㏹' => '26日',
+  '㏺' => '27日',
+  '㏻' => '28日',
+  '㏼' => '29日',
+  '㏽' => '30日',
+  '㏾' => '31日',
+  '㏿' => 'gal',
+  'ꚜ' => 'ъ',
+  'ꚝ' => 'ь',
+  'ꝰ' => 'ꝯ',
+  'ꟸ' => 'Ħ',
+  'ꟹ' => 'œ',
+  'ꭜ' => 'ꜧ',
+  'ꭝ' => 'ꬷ',
+  'ꭞ' => 'ɫ',
+  'ꭟ' => 'ꭒ',
+  'ꭩ' => 'ʍ',
+  'ff' => 'ff',
+  'fi' => 'fi',
+  'fl' => 'fl',
+  'ffi' => 'ffi',
+  'ffl' => 'ffl',
+  'ſt' => 'st',
+  'st' => 'st',
+  'ﬓ' => 'մն',
+  'ﬔ' => 'մե',
+  'ﬕ' => 'մի',
+  'ﬖ' => 'վն',
+  'ﬗ' => 'մխ',
+  'ﬠ' => 'ע',
+  'ﬡ' => 'א',
+  'ﬢ' => 'ד',
+  'ﬣ' => 'ה',
+  'ﬤ' => 'כ',
+  'ﬥ' => 'ל',
+  'ﬦ' => 'ם',
+  'ﬧ' => 'ר',
+  'ﬨ' => 'ת',
+  '﬩' => '+',
+  'ﭏ' => 'אל',
+  'ﭐ' => 'ٱ',
+  'ﭑ' => 'ٱ',
+  'ﭒ' => 'ٻ',
+  'ﭓ' => 'ٻ',
+  'ﭔ' => 'ٻ',
+  'ﭕ' => 'ٻ',
+  'ﭖ' => 'پ',
+  'ﭗ' => 'پ',
+  'ﭘ' => 'پ',
+  'ﭙ' => 'پ',
+  'ﭚ' => 'ڀ',
+  'ﭛ' => 'ڀ',
+  'ﭜ' => 'ڀ',
+  'ﭝ' => 'ڀ',
+  'ﭞ' => 'ٺ',
+  'ﭟ' => 'ٺ',
+  'ﭠ' => 'ٺ',
+  'ﭡ' => 'ٺ',
+  'ﭢ' => 'ٿ',
+  'ﭣ' => 'ٿ',
+  'ﭤ' => 'ٿ',
+  'ﭥ' => 'ٿ',
+  'ﭦ' => 'ٹ',
+  'ﭧ' => 'ٹ',
+  'ﭨ' => 'ٹ',
+  'ﭩ' => 'ٹ',
+  'ﭪ' => 'ڤ',
+  'ﭫ' => 'ڤ',
+  'ﭬ' => 'ڤ',
+  'ﭭ' => 'ڤ',
+  'ﭮ' => 'ڦ',
+  'ﭯ' => 'ڦ',
+  'ﭰ' => 'ڦ',
+  'ﭱ' => 'ڦ',
+  'ﭲ' => 'ڄ',
+  'ﭳ' => 'ڄ',
+  'ﭴ' => 'ڄ',
+  'ﭵ' => 'ڄ',
+  'ﭶ' => 'ڃ',
+  'ﭷ' => 'ڃ',
+  'ﭸ' => 'ڃ',
+  'ﭹ' => 'ڃ',
+  'ﭺ' => 'چ',
+  'ﭻ' => 'چ',
+  'ﭼ' => 'چ',
+  'ﭽ' => 'چ',
+  'ﭾ' => 'ڇ',
+  'ﭿ' => 'ڇ',
+  'ﮀ' => 'ڇ',
+  'ﮁ' => 'ڇ',
+  'ﮂ' => 'ڍ',
+  'ﮃ' => 'ڍ',
+  'ﮄ' => 'ڌ',
+  'ﮅ' => 'ڌ',
+  'ﮆ' => 'ڎ',
+  'ﮇ' => 'ڎ',
+  'ﮈ' => 'ڈ',
+  'ﮉ' => 'ڈ',
+  'ﮊ' => 'ژ',
+  'ﮋ' => 'ژ',
+  'ﮌ' => 'ڑ',
+  'ﮍ' => 'ڑ',
+  'ﮎ' => 'ک',
+  'ﮏ' => 'ک',
+  'ﮐ' => 'ک',
+  'ﮑ' => 'ک',
+  'ﮒ' => 'گ',
+  'ﮓ' => 'گ',
+  'ﮔ' => 'گ',
+  'ﮕ' => 'گ',
+  'ﮖ' => 'ڳ',
+  'ﮗ' => 'ڳ',
+  'ﮘ' => 'ڳ',
+  'ﮙ' => 'ڳ',
+  'ﮚ' => 'ڱ',
+  'ﮛ' => 'ڱ',
+  'ﮜ' => 'ڱ',
+  'ﮝ' => 'ڱ',
+  'ﮞ' => 'ں',
+  'ﮟ' => 'ں',
+  'ﮠ' => 'ڻ',
+  'ﮡ' => 'ڻ',
+  'ﮢ' => 'ڻ',
+  'ﮣ' => 'ڻ',
+  'ﮤ' => 'ۀ',
+  'ﮥ' => 'ۀ',
+  'ﮦ' => 'ہ',
+  'ﮧ' => 'ہ',
+  'ﮨ' => 'ہ',
+  'ﮩ' => 'ہ',
+  'ﮪ' => 'ھ',
+  'ﮫ' => 'ھ',
+  'ﮬ' => 'ھ',
+  'ﮭ' => 'ھ',
+  'ﮮ' => 'ے',
+  'ﮯ' => 'ے',
+  'ﮰ' => 'ۓ',
+  'ﮱ' => 'ۓ',
+  'ﯓ' => 'ڭ',
+  'ﯔ' => 'ڭ',
+  'ﯕ' => 'ڭ',
+  'ﯖ' => 'ڭ',
+  'ﯗ' => 'ۇ',
+  'ﯘ' => 'ۇ',
+  'ﯙ' => 'ۆ',
+  'ﯚ' => 'ۆ',
+  'ﯛ' => 'ۈ',
+  'ﯜ' => 'ۈ',
+  'ﯝ' => 'ۇٴ',
+  'ﯞ' => 'ۋ',
+  'ﯟ' => 'ۋ',
+  'ﯠ' => 'ۅ',
+  'ﯡ' => 'ۅ',
+  'ﯢ' => 'ۉ',
+  'ﯣ' => 'ۉ',
+  'ﯤ' => 'ې',
+  'ﯥ' => 'ې',
+  'ﯦ' => 'ې',
+  'ﯧ' => 'ې',
+  'ﯨ' => 'ى',
+  'ﯩ' => 'ى',
+  'ﯪ' => 'ئا',
+  'ﯫ' => 'ئا',
+  'ﯬ' => 'ئە',
+  'ﯭ' => 'ئە',
+  'ﯮ' => 'ئو',
+  'ﯯ' => 'ئو',
+  'ﯰ' => 'ئۇ',
+  'ﯱ' => 'ئۇ',
+  'ﯲ' => 'ئۆ',
+  'ﯳ' => 'ئۆ',
+  'ﯴ' => 'ئۈ',
+  'ﯵ' => 'ئۈ',
+  'ﯶ' => 'ئې',
+  'ﯷ' => 'ئې',
+  'ﯸ' => 'ئې',
+  'ﯹ' => 'ئى',
+  'ﯺ' => 'ئى',
+  'ﯻ' => 'ئى',
+  'ﯼ' => 'ی',
+  'ﯽ' => 'ی',
+  'ﯾ' => 'ی',
+  'ﯿ' => 'ی',
+  'ﰀ' => 'ئج',
+  'ﰁ' => 'ئح',
+  'ﰂ' => 'ئم',
+  'ﰃ' => 'ئى',
+  'ﰄ' => 'ئي',
+  'ﰅ' => 'بج',
+  'ﰆ' => 'بح',
+  'ﰇ' => 'بخ',
+  'ﰈ' => 'بم',
+  'ﰉ' => 'بى',
+  'ﰊ' => 'بي',
+  'ﰋ' => 'تج',
+  'ﰌ' => 'تح',
+  'ﰍ' => 'تخ',
+  'ﰎ' => 'تم',
+  'ﰏ' => 'تى',
+  'ﰐ' => 'تي',
+  'ﰑ' => 'ثج',
+  'ﰒ' => 'ثم',
+  'ﰓ' => 'ثى',
+  'ﰔ' => 'ثي',
+  'ﰕ' => 'جح',
+  'ﰖ' => 'جم',
+  'ﰗ' => 'حج',
+  'ﰘ' => 'حم',
+  'ﰙ' => 'خج',
+  'ﰚ' => 'خح',
+  'ﰛ' => 'خم',
+  'ﰜ' => 'سج',
+  'ﰝ' => 'سح',
+  'ﰞ' => 'سخ',
+  'ﰟ' => 'سم',
+  'ﰠ' => 'صح',
+  'ﰡ' => 'صم',
+  'ﰢ' => 'ضج',
+  'ﰣ' => 'ضح',
+  'ﰤ' => 'ضخ',
+  'ﰥ' => 'ضم',
+  'ﰦ' => 'طح',
+  'ﰧ' => 'طم',
+  'ﰨ' => 'ظم',
+  'ﰩ' => 'عج',
+  'ﰪ' => 'عم',
+  'ﰫ' => 'غج',
+  'ﰬ' => 'غم',
+  'ﰭ' => 'فج',
+  'ﰮ' => 'فح',
+  'ﰯ' => 'فخ',
+  'ﰰ' => 'فم',
+  'ﰱ' => 'فى',
+  'ﰲ' => 'في',
+  'ﰳ' => 'قح',
+  'ﰴ' => 'قم',
+  'ﰵ' => 'قى',
+  'ﰶ' => 'قي',
+  'ﰷ' => 'كا',
+  'ﰸ' => 'كج',
+  'ﰹ' => 'كح',
+  'ﰺ' => 'كخ',
+  'ﰻ' => 'كل',
+  'ﰼ' => 'كم',
+  'ﰽ' => 'كى',
+  'ﰾ' => 'كي',
+  'ﰿ' => 'لج',
+  'ﱀ' => 'لح',
+  'ﱁ' => 'لخ',
+  'ﱂ' => 'لم',
+  'ﱃ' => 'لى',
+  'ﱄ' => 'لي',
+  'ﱅ' => 'مج',
+  'ﱆ' => 'مح',
+  'ﱇ' => 'مخ',
+  'ﱈ' => 'مم',
+  'ﱉ' => 'مى',
+  'ﱊ' => 'مي',
+  'ﱋ' => 'نج',
+  'ﱌ' => 'نح',
+  'ﱍ' => 'نخ',
+  'ﱎ' => 'نم',
+  'ﱏ' => 'نى',
+  'ﱐ' => 'ني',
+  'ﱑ' => 'هج',
+  'ﱒ' => 'هم',
+  'ﱓ' => 'هى',
+  'ﱔ' => 'هي',
+  'ﱕ' => 'يج',
+  'ﱖ' => 'يح',
+  'ﱗ' => 'يخ',
+  'ﱘ' => 'يم',
+  'ﱙ' => 'يى',
+  'ﱚ' => 'يي',
+  'ﱛ' => 'ذٰ',
+  'ﱜ' => 'رٰ',
+  'ﱝ' => 'ىٰ',
+  'ﱞ' => ' ٌّ',
+  'ﱟ' => ' ٍّ',
+  'ﱠ' => ' َّ',
+  'ﱡ' => ' ُّ',
+  'ﱢ' => ' ِّ',
+  'ﱣ' => ' ّٰ',
+  'ﱤ' => 'ئر',
+  'ﱥ' => 'ئز',
+  'ﱦ' => 'ئم',
+  'ﱧ' => 'ئن',
+  'ﱨ' => 'ئى',
+  'ﱩ' => 'ئي',
+  'ﱪ' => 'بر',
+  'ﱫ' => 'بز',
+  'ﱬ' => 'بم',
+  'ﱭ' => 'بن',
+  'ﱮ' => 'بى',
+  'ﱯ' => 'بي',
+  'ﱰ' => 'تر',
+  'ﱱ' => 'تز',
+  'ﱲ' => 'تم',
+  'ﱳ' => 'تن',
+  'ﱴ' => 'تى',
+  'ﱵ' => 'تي',
+  'ﱶ' => 'ثر',
+  'ﱷ' => 'ثز',
+  'ﱸ' => 'ثم',
+  'ﱹ' => 'ثن',
+  'ﱺ' => 'ثى',
+  'ﱻ' => 'ثي',
+  'ﱼ' => 'فى',
+  'ﱽ' => 'في',
+  'ﱾ' => 'قى',
+  'ﱿ' => 'قي',
+  'ﲀ' => 'كا',
+  'ﲁ' => 'كل',
+  'ﲂ' => 'كم',
+  'ﲃ' => 'كى',
+  'ﲄ' => 'كي',
+  'ﲅ' => 'لم',
+  'ﲆ' => 'لى',
+  'ﲇ' => 'لي',
+  'ﲈ' => 'ما',
+  'ﲉ' => 'مم',
+  'ﲊ' => 'نر',
+  'ﲋ' => 'نز',
+  'ﲌ' => 'نم',
+  'ﲍ' => 'نن',
+  'ﲎ' => 'نى',
+  'ﲏ' => 'ني',
+  'ﲐ' => 'ىٰ',
+  'ﲑ' => 'ير',
+  'ﲒ' => 'يز',
+  'ﲓ' => 'يم',
+  'ﲔ' => 'ين',
+  'ﲕ' => 'يى',
+  'ﲖ' => 'يي',
+  'ﲗ' => 'ئج',
+  'ﲘ' => 'ئح',
+  'ﲙ' => 'ئخ',
+  'ﲚ' => 'ئم',
+  'ﲛ' => 'ئه',
+  'ﲜ' => 'بج',
+  'ﲝ' => 'بح',
+  'ﲞ' => 'بخ',
+  'ﲟ' => 'بم',
+  'ﲠ' => 'به',
+  'ﲡ' => 'تج',
+  'ﲢ' => 'تح',
+  'ﲣ' => 'تخ',
+  'ﲤ' => 'تم',
+  'ﲥ' => 'ته',
+  'ﲦ' => 'ثم',
+  'ﲧ' => 'جح',
+  'ﲨ' => 'جم',
+  'ﲩ' => 'حج',
+  'ﲪ' => 'حم',
+  'ﲫ' => 'خج',
+  'ﲬ' => 'خم',
+  'ﲭ' => 'سج',
+  'ﲮ' => 'سح',
+  'ﲯ' => 'سخ',
+  'ﲰ' => 'سم',
+  'ﲱ' => 'صح',
+  'ﲲ' => 'صخ',
+  'ﲳ' => 'صم',
+  'ﲴ' => 'ضج',
+  'ﲵ' => 'ضح',
+  'ﲶ' => 'ضخ',
+  'ﲷ' => 'ضم',
+  'ﲸ' => 'طح',
+  'ﲹ' => 'ظم',
+  'ﲺ' => 'عج',
+  'ﲻ' => 'عم',
+  'ﲼ' => 'غج',
+  'ﲽ' => 'غم',
+  'ﲾ' => 'فج',
+  'ﲿ' => 'فح',
+  'ﳀ' => 'فخ',
+  'ﳁ' => 'فم',
+  'ﳂ' => 'قح',
+  'ﳃ' => 'قم',
+  'ﳄ' => 'كج',
+  'ﳅ' => 'كح',
+  'ﳆ' => 'كخ',
+  'ﳇ' => 'كل',
+  'ﳈ' => 'كم',
+  'ﳉ' => 'لج',
+  'ﳊ' => 'لح',
+  'ﳋ' => 'لخ',
+  'ﳌ' => 'لم',
+  'ﳍ' => 'له',
+  'ﳎ' => 'مج',
+  'ﳏ' => 'مح',
+  'ﳐ' => 'مخ',
+  'ﳑ' => 'مم',
+  'ﳒ' => 'نج',
+  'ﳓ' => 'نح',
+  'ﳔ' => 'نخ',
+  'ﳕ' => 'نم',
+  'ﳖ' => 'نه',
+  'ﳗ' => 'هج',
+  'ﳘ' => 'هم',
+  'ﳙ' => 'هٰ',
+  'ﳚ' => 'يج',
+  'ﳛ' => 'يح',
+  'ﳜ' => 'يخ',
+  'ﳝ' => 'يم',
+  'ﳞ' => 'يه',
+  'ﳟ' => 'ئم',
+  'ﳠ' => 'ئه',
+  'ﳡ' => 'بم',
+  'ﳢ' => 'به',
+  'ﳣ' => 'تم',
+  'ﳤ' => 'ته',
+  'ﳥ' => 'ثم',
+  'ﳦ' => 'ثه',
+  'ﳧ' => 'سم',
+  'ﳨ' => 'سه',
+  'ﳩ' => 'شم',
+  'ﳪ' => 'شه',
+  'ﳫ' => 'كل',
+  'ﳬ' => 'كم',
+  'ﳭ' => 'لم',
+  'ﳮ' => 'نم',
+  'ﳯ' => 'نه',
+  'ﳰ' => 'يم',
+  'ﳱ' => 'يه',
+  'ﳲ' => 'ـَّ',
+  'ﳳ' => 'ـُّ',
+  'ﳴ' => 'ـِّ',
+  'ﳵ' => 'طى',
+  'ﳶ' => 'طي',
+  'ﳷ' => 'عى',
+  'ﳸ' => 'عي',
+  'ﳹ' => 'غى',
+  'ﳺ' => 'غي',
+  'ﳻ' => 'سى',
+  'ﳼ' => 'سي',
+  'ﳽ' => 'شى',
+  'ﳾ' => 'شي',
+  'ﳿ' => 'حى',
+  'ﴀ' => 'حي',
+  'ﴁ' => 'جى',
+  'ﴂ' => 'جي',
+  'ﴃ' => 'خى',
+  'ﴄ' => 'خي',
+  'ﴅ' => 'صى',
+  'ﴆ' => 'صي',
+  'ﴇ' => 'ضى',
+  'ﴈ' => 'ضي',
+  'ﴉ' => 'شج',
+  'ﴊ' => 'شح',
+  'ﴋ' => 'شخ',
+  'ﴌ' => 'شم',
+  'ﴍ' => 'شر',
+  'ﴎ' => 'سر',
+  'ﴏ' => 'صر',
+  'ﴐ' => 'ضر',
+  'ﴑ' => 'طى',
+  'ﴒ' => 'طي',
+  'ﴓ' => 'عى',
+  'ﴔ' => 'عي',
+  'ﴕ' => 'غى',
+  'ﴖ' => 'غي',
+  'ﴗ' => 'سى',
+  'ﴘ' => 'سي',
+  'ﴙ' => 'شى',
+  'ﴚ' => 'شي',
+  'ﴛ' => 'حى',
+  'ﴜ' => 'حي',
+  'ﴝ' => 'جى',
+  'ﴞ' => 'جي',
+  'ﴟ' => 'خى',
+  'ﴠ' => 'خي',
+  'ﴡ' => 'صى',
+  'ﴢ' => 'صي',
+  'ﴣ' => 'ضى',
+  'ﴤ' => 'ضي',
+  'ﴥ' => 'شج',
+  'ﴦ' => 'شح',
+  'ﴧ' => 'شخ',
+  'ﴨ' => 'شم',
+  'ﴩ' => 'شر',
+  'ﴪ' => 'سر',
+  'ﴫ' => 'صر',
+  'ﴬ' => 'ضر',
+  'ﴭ' => 'شج',
+  'ﴮ' => 'شح',
+  'ﴯ' => 'شخ',
+  'ﴰ' => 'شم',
+  'ﴱ' => 'سه',
+  'ﴲ' => 'شه',
+  'ﴳ' => 'طم',
+  'ﴴ' => 'سج',
+  'ﴵ' => 'سح',
+  'ﴶ' => 'سخ',
+  'ﴷ' => 'شج',
+  'ﴸ' => 'شح',
+  'ﴹ' => 'شخ',
+  'ﴺ' => 'طم',
+  'ﴻ' => 'ظم',
+  'ﴼ' => 'اً',
+  'ﴽ' => 'اً',
+  'ﵐ' => 'تجم',
+  'ﵑ' => 'تحج',
+  'ﵒ' => 'تحج',
+  'ﵓ' => 'تحم',
+  'ﵔ' => 'تخم',
+  'ﵕ' => 'تمج',
+  'ﵖ' => 'تمح',
+  'ﵗ' => 'تمخ',
+  'ﵘ' => 'جمح',
+  'ﵙ' => 'جمح',
+  'ﵚ' => 'حمي',
+  'ﵛ' => 'حمى',
+  'ﵜ' => 'سحج',
+  'ﵝ' => 'سجح',
+  'ﵞ' => 'سجى',
+  'ﵟ' => 'سمح',
+  'ﵠ' => 'سمح',
+  'ﵡ' => 'سمج',
+  'ﵢ' => 'سمم',
+  'ﵣ' => 'سمم',
+  'ﵤ' => 'صحح',
+  'ﵥ' => 'صحح',
+  'ﵦ' => 'صمم',
+  'ﵧ' => 'شحم',
+  'ﵨ' => 'شحم',
+  'ﵩ' => 'شجي',
+  'ﵪ' => 'شمخ',
+  'ﵫ' => 'شمخ',
+  'ﵬ' => 'شمم',
+  'ﵭ' => 'شمم',
+  'ﵮ' => 'ضحى',
+  'ﵯ' => 'ضخم',
+  'ﵰ' => 'ضخم',
+  'ﵱ' => 'طمح',
+  'ﵲ' => 'طمح',
+  'ﵳ' => 'طمم',
+  'ﵴ' => 'طمي',
+  'ﵵ' => 'عجم',
+  'ﵶ' => 'عمم',
+  'ﵷ' => 'عمم',
+  'ﵸ' => 'عمى',
+  'ﵹ' => 'غمم',
+  'ﵺ' => 'غمي',
+  'ﵻ' => 'غمى',
+  'ﵼ' => 'فخم',
+  'ﵽ' => 'فخم',
+  'ﵾ' => 'قمح',
+  'ﵿ' => 'قمم',
+  'ﶀ' => 'لحم',
+  'ﶁ' => 'لحي',
+  'ﶂ' => 'لحى',
+  'ﶃ' => 'لجج',
+  'ﶄ' => 'لجج',
+  'ﶅ' => 'لخم',
+  'ﶆ' => 'لخم',
+  'ﶇ' => 'لمح',
+  'ﶈ' => 'لمح',
+  'ﶉ' => 'محج',
+  'ﶊ' => 'محم',
+  'ﶋ' => 'محي',
+  'ﶌ' => 'مجح',
+  'ﶍ' => 'مجم',
+  'ﶎ' => 'مخج',
+  'ﶏ' => 'مخم',
+  'ﶒ' => 'مجخ',
+  'ﶓ' => 'همج',
+  'ﶔ' => 'همم',
+  'ﶕ' => 'نحم',
+  'ﶖ' => 'نحى',
+  'ﶗ' => 'نجم',
+  'ﶘ' => 'نجم',
+  'ﶙ' => 'نجى',
+  'ﶚ' => 'نمي',
+  'ﶛ' => 'نمى',
+  'ﶜ' => 'يمم',
+  'ﶝ' => 'يمم',
+  'ﶞ' => 'بخي',
+  'ﶟ' => 'تجي',
+  'ﶠ' => 'تجى',
+  'ﶡ' => 'تخي',
+  'ﶢ' => 'تخى',
+  'ﶣ' => 'تمي',
+  'ﶤ' => 'تمى',
+  'ﶥ' => 'جمي',
+  'ﶦ' => 'جحى',
+  'ﶧ' => 'جمى',
+  'ﶨ' => 'سخى',
+  'ﶩ' => 'صحي',
+  'ﶪ' => 'شحي',
+  'ﶫ' => 'ضحي',
+  'ﶬ' => 'لجي',
+  'ﶭ' => 'لمي',
+  'ﶮ' => 'يحي',
+  'ﶯ' => 'يجي',
+  'ﶰ' => 'يمي',
+  'ﶱ' => 'ممي',
+  'ﶲ' => 'قمي',
+  'ﶳ' => 'نحي',
+  'ﶴ' => 'قمح',
+  'ﶵ' => 'لحم',
+  'ﶶ' => 'عمي',
+  'ﶷ' => 'كمي',
+  'ﶸ' => 'نجح',
+  'ﶹ' => 'مخي',
+  'ﶺ' => 'لجم',
+  'ﶻ' => 'كمم',
+  'ﶼ' => 'لجم',
+  'ﶽ' => 'نجح',
+  'ﶾ' => 'جحي',
+  'ﶿ' => 'حجي',
+  'ﷀ' => 'مجي',
+  'ﷁ' => 'فمي',
+  'ﷂ' => 'بحي',
+  'ﷃ' => 'كمم',
+  'ﷄ' => 'عجم',
+  'ﷅ' => 'صمم',
+  'ﷆ' => 'سخي',
+  'ﷇ' => 'نجي',
+  'ﷰ' => 'صلے',
+  'ﷱ' => 'قلے',
+  'ﷲ' => 'الله',
+  'ﷳ' => 'اكبر',
+  'ﷴ' => 'محمد',
+  'ﷵ' => 'صلعم',
+  'ﷶ' => 'رسول',
+  'ﷷ' => 'عليه',
+  'ﷸ' => 'وسلم',
+  'ﷹ' => 'صلى',
+  'ﷺ' => 'صلى الله عليه وسلم',
+  'ﷻ' => 'جل جلاله',
+  '﷼' => 'ریال',
+  '︐' => ',',
+  '︑' => '、',
+  '︒' => '。',
+  '︓' => ':',
+  '︔' => ';',
+  '︕' => '!',
+  '︖' => '?',
+  '︗' => '〖',
+  '︘' => '〗',
+  '︙' => '...',
+  '︰' => '..',
+  '︱' => '—',
+  '︲' => '–',
+  '︳' => '_',
+  '︴' => '_',
+  '︵' => '(',
+  '︶' => ')',
+  '︷' => '{',
+  '︸' => '}',
+  '︹' => '〔',
+  '︺' => '〕',
+  '︻' => '【',
+  '︼' => '】',
+  '︽' => '《',
+  '︾' => '》',
+  '︿' => '〈',
+  '﹀' => '〉',
+  '﹁' => '「',
+  '﹂' => '」',
+  '﹃' => '『',
+  '﹄' => '』',
+  '﹇' => '[',
+  '﹈' => ']',
+  '﹉' => ' ̅',
+  '﹊' => ' ̅',
+  '﹋' => ' ̅',
+  '﹌' => ' ̅',
+  '﹍' => '_',
+  '﹎' => '_',
+  '﹏' => '_',
+  '﹐' => ',',
+  '﹑' => '、',
+  '﹒' => '.',
+  '﹔' => ';',
+  '﹕' => ':',
+  '﹖' => '?',
+  '﹗' => '!',
+  '﹘' => '—',
+  '﹙' => '(',
+  '﹚' => ')',
+  '﹛' => '{',
+  '﹜' => '}',
+  '﹝' => '〔',
+  '﹞' => '〕',
+  '﹟' => '#',
+  '﹠' => '&',
+  '﹡' => '*',
+  '﹢' => '+',
+  '﹣' => '-',
+  '﹤' => '<',
+  '﹥' => '>',
+  '﹦' => '=',
+  '﹨' => '\\',
+  '﹩' => '$',
+  '﹪' => '%',
+  '﹫' => '@',
+  'ﹰ' => ' ً',
+  'ﹱ' => 'ـً',
+  'ﹲ' => ' ٌ',
+  'ﹴ' => ' ٍ',
+  'ﹶ' => ' َ',
+  'ﹷ' => 'ـَ',
+  'ﹸ' => ' ُ',
+  'ﹹ' => 'ـُ',
+  'ﹺ' => ' ِ',
+  'ﹻ' => 'ـِ',
+  'ﹼ' => ' ّ',
+  'ﹽ' => 'ـّ',
+  'ﹾ' => ' ْ',
+  'ﹿ' => 'ـْ',
+  'ﺀ' => 'ء',
+  'ﺁ' => 'آ',
+  'ﺂ' => 'آ',
+  'ﺃ' => 'أ',
+  'ﺄ' => 'أ',
+  'ﺅ' => 'ؤ',
+  'ﺆ' => 'ؤ',
+  'ﺇ' => 'إ',
+  'ﺈ' => 'إ',
+  'ﺉ' => 'ئ',
+  'ﺊ' => 'ئ',
+  'ﺋ' => 'ئ',
+  'ﺌ' => 'ئ',
+  'ﺍ' => 'ا',
+  'ﺎ' => 'ا',
+  'ﺏ' => 'ب',
+  'ﺐ' => 'ب',
+  'ﺑ' => 'ب',
+  'ﺒ' => 'ب',
+  'ﺓ' => 'ة',
+  'ﺔ' => 'ة',
+  'ﺕ' => 'ت',
+  'ﺖ' => 'ت',
+  'ﺗ' => 'ت',
+  'ﺘ' => 'ت',
+  'ﺙ' => 'ث',
+  'ﺚ' => 'ث',
+  'ﺛ' => 'ث',
+  'ﺜ' => 'ث',
+  'ﺝ' => 'ج',
+  'ﺞ' => 'ج',
+  'ﺟ' => 'ج',
+  'ﺠ' => 'ج',
+  'ﺡ' => 'ح',
+  'ﺢ' => 'ح',
+  'ﺣ' => 'ح',
+  'ﺤ' => 'ح',
+  'ﺥ' => 'خ',
+  'ﺦ' => 'خ',
+  'ﺧ' => 'خ',
+  'ﺨ' => 'خ',
+  'ﺩ' => 'د',
+  'ﺪ' => 'د',
+  'ﺫ' => 'ذ',
+  'ﺬ' => 'ذ',
+  'ﺭ' => 'ر',
+  'ﺮ' => 'ر',
+  'ﺯ' => 'ز',
+  'ﺰ' => 'ز',
+  'ﺱ' => 'س',
+  'ﺲ' => 'س',
+  'ﺳ' => 'س',
+  'ﺴ' => 'س',
+  'ﺵ' => 'ش',
+  'ﺶ' => 'ش',
+  'ﺷ' => 'ش',
+  'ﺸ' => 'ش',
+  'ﺹ' => 'ص',
+  'ﺺ' => 'ص',
+  'ﺻ' => 'ص',
+  'ﺼ' => 'ص',
+  'ﺽ' => 'ض',
+  'ﺾ' => 'ض',
+  'ﺿ' => 'ض',
+  'ﻀ' => 'ض',
+  'ﻁ' => 'ط',
+  'ﻂ' => 'ط',
+  'ﻃ' => 'ط',
+  'ﻄ' => 'ط',
+  'ﻅ' => 'ظ',
+  'ﻆ' => 'ظ',
+  'ﻇ' => 'ظ',
+  'ﻈ' => 'ظ',
+  'ﻉ' => 'ع',
+  'ﻊ' => 'ع',
+  'ﻋ' => 'ع',
+  'ﻌ' => 'ع',
+  'ﻍ' => 'غ',
+  'ﻎ' => 'غ',
+  'ﻏ' => 'غ',
+  'ﻐ' => 'غ',
+  'ﻑ' => 'ف',
+  'ﻒ' => 'ف',
+  'ﻓ' => 'ف',
+  'ﻔ' => 'ف',
+  'ﻕ' => 'ق',
+  'ﻖ' => 'ق',
+  'ﻗ' => 'ق',
+  'ﻘ' => 'ق',
+  'ﻙ' => 'ك',
+  'ﻚ' => 'ك',
+  'ﻛ' => 'ك',
+  'ﻜ' => 'ك',
+  'ﻝ' => 'ل',
+  'ﻞ' => 'ل',
+  'ﻟ' => 'ل',
+  'ﻠ' => 'ل',
+  'ﻡ' => 'م',
+  'ﻢ' => 'م',
+  'ﻣ' => 'م',
+  'ﻤ' => 'م',
+  'ﻥ' => 'ن',
+  'ﻦ' => 'ن',
+  'ﻧ' => 'ن',
+  'ﻨ' => 'ن',
+  'ﻩ' => 'ه',
+  'ﻪ' => 'ه',
+  'ﻫ' => 'ه',
+  'ﻬ' => 'ه',
+  'ﻭ' => 'و',
+  'ﻮ' => 'و',
+  'ﻯ' => 'ى',
+  'ﻰ' => 'ى',
+  'ﻱ' => 'ي',
+  'ﻲ' => 'ي',
+  'ﻳ' => 'ي',
+  'ﻴ' => 'ي',
+  'ﻵ' => 'لآ',
+  'ﻶ' => 'لآ',
+  'ﻷ' => 'لأ',
+  'ﻸ' => 'لأ',
+  'ﻹ' => 'لإ',
+  'ﻺ' => 'لإ',
+  'ﻻ' => 'لا',
+  'ﻼ' => 'لا',
+  '！' => '!',
+  '＂' => '"',
+  '＃' => '#',
+  '＄' => '$',
+  '％' => '%',
+  '＆' => '&',
+  '＇' => '\'',
+  '（' => '(',
+  '）' => ')',
+  '＊' => '*',
+  '＋' => '+',
+  '，' => ',',
+  '－' => '-',
+  '．' => '.',
+  '／' => '/',
+  '０' => '0',
+  '１' => '1',
+  '２' => '2',
+  '３' => '3',
+  '４' => '4',
+  '５' => '5',
+  '６' => '6',
+  '７' => '7',
+  '８' => '8',
+  '９' => '9',
+  '：' => ':',
+  '；' => ';',
+  '＜' => '<',
+  '＝' => '=',
+  '＞' => '>',
+  '？' => '?',
+  '＠' => '@',
+  'Ａ' => 'A',
+  'Ｂ' => 'B',
+  'Ｃ' => 'C',
+  'Ｄ' => 'D',
+  'Ｅ' => 'E',
+  'Ｆ' => 'F',
+  'Ｇ' => 'G',
+  'Ｈ' => 'H',
+  'Ｉ' => 'I',
+  'Ｊ' => 'J',
+  'Ｋ' => 'K',
+  'Ｌ' => 'L',
+  'Ｍ' => 'M',
+  'Ｎ' => 'N',
+  'Ｏ' => 'O',
+  'Ｐ' => 'P',
+  'Ｑ' => 'Q',
+  'Ｒ' => 'R',
+  'Ｓ' => 'S',
+  'Ｔ' => 'T',
+  'Ｕ' => 'U',
+  'Ｖ' => 'V',
+  'Ｗ' => 'W',
+  'Ｘ' => 'X',
+  'Ｙ' => 'Y',
+  'Ｚ' => 'Z',
+  '［' => '[',
+  '＼' => '\\',
+  '］' => ']',
+  '＾' => '^',
+  '＿' => '_',
+  '｀' => '`',
+  'ａ' => 'a',
+  'ｂ' => 'b',
+  'ｃ' => 'c',
+  'ｄ' => 'd',
+  'ｅ' => 'e',
+  'ｆ' => 'f',
+  'ｇ' => 'g',
+  'ｈ' => 'h',
+  'ｉ' => 'i',
+  'ｊ' => 'j',
+  'ｋ' => 'k',
+  'ｌ' => 'l',
+  'ｍ' => 'm',
+  'ｎ' => 'n',
+  'ｏ' => 'o',
+  'ｐ' => 'p',
+  'ｑ' => 'q',
+  'ｒ' => 'r',
+  'ｓ' => 's',
+  'ｔ' => 't',
+  'ｕ' => 'u',
+  'ｖ' => 'v',
+  'ｗ' => 'w',
+  'ｘ' => 'x',
+  'ｙ' => 'y',
+  'ｚ' => 'z',
+  '｛' => '{',
+  '｜' => '|',
+  '｝' => '}',
+  '～' => '~',
+  '｟' => '⦅',
+  '｠' => '⦆',
+  '｡' => '。',
+  '｢' => '「',
+  '｣' => '」',
+  '､' => '、',
+  '･' => '・',
+  'ｦ' => 'ヲ',
+  'ｧ' => 'ァ',
+  'ｨ' => 'ィ',
+  'ｩ' => 'ゥ',
+  'ｪ' => 'ェ',
+  'ｫ' => 'ォ',
+  'ｬ' => 'ャ',
+  'ｭ' => 'ュ',
+  'ｮ' => 'ョ',
+  'ｯ' => 'ッ',
+  'ｰ' => 'ー',
+  'ｱ' => 'ア',
+  'ｲ' => 'イ',
+  'ｳ' => 'ウ',
+  'ｴ' => 'エ',
+  'ｵ' => 'オ',
+  'ｶ' => 'カ',
+  'ｷ' => 'キ',
+  'ｸ' => 'ク',
+  'ｹ' => 'ケ',
+  'ｺ' => 'コ',
+  'ｻ' => 'サ',
+  'ｼ' => 'シ',
+  'ｽ' => 'ス',
+  'ｾ' => 'セ',
+  'ｿ' => 'ソ',
+  'ﾀ' => 'タ',
+  'ﾁ' => 'チ',
+  'ﾂ' => 'ツ',
+  'ﾃ' => 'テ',
+  'ﾄ' => 'ト',
+  'ﾅ' => 'ナ',
+  'ﾆ' => 'ニ',
+  'ﾇ' => 'ヌ',
+  'ﾈ' => 'ネ',
+  'ﾉ' => 'ノ',
+  'ﾊ' => 'ハ',
+  'ﾋ' => 'ヒ',
+  'ﾌ' => 'フ',
+  'ﾍ' => 'ヘ',
+  'ﾎ' => 'ホ',
+  'ﾏ' => 'マ',
+  'ﾐ' => 'ミ',
+  'ﾑ' => 'ム',
+  'ﾒ' => 'メ',
+  'ﾓ' => 'モ',
+  'ﾔ' => 'ヤ',
+  'ﾕ' => 'ユ',
+  'ﾖ' => 'ヨ',
+  'ﾗ' => 'ラ',
+  'ﾘ' => 'リ',
+  'ﾙ' => 'ル',
+  'ﾚ' => 'レ',
+  'ﾛ' => 'ロ',
+  'ﾜ' => 'ワ',
+  'ﾝ' => 'ン',
+  'ﾞ' => '゙',
+  'ﾟ' => '゚',
+  'ﾠ' => 'ᅠ',
+  'ﾡ' => 'ᄀ',
+  'ﾢ' => 'ᄁ',
+  'ﾣ' => 'ᆪ',
+  'ﾤ' => 'ᄂ',
+  'ﾥ' => 'ᆬ',
+  'ﾦ' => 'ᆭ',
+  'ﾧ' => 'ᄃ',
+  'ﾨ' => 'ᄄ',
+  'ﾩ' => 'ᄅ',
+  'ﾪ' => 'ᆰ',
+  'ﾫ' => 'ᆱ',
+  'ﾬ' => 'ᆲ',
+  'ﾭ' => 'ᆳ',
+  'ﾮ' => 'ᆴ',
+  'ﾯ' => 'ᆵ',
+  'ﾰ' => 'ᄚ',
+  'ﾱ' => 'ᄆ',
+  'ﾲ' => 'ᄇ',
+  'ﾳ' => 'ᄈ',
+  'ﾴ' => 'ᄡ',
+  'ﾵ' => 'ᄉ',
+  'ﾶ' => 'ᄊ',
+  'ﾷ' => 'ᄋ',
+  'ﾸ' => 'ᄌ',
+  'ﾹ' => 'ᄍ',
+  'ﾺ' => 'ᄎ',
+  'ﾻ' => 'ᄏ',
+  'ﾼ' => 'ᄐ',
+  'ﾽ' => 'ᄑ',
+  'ﾾ' => 'ᄒ',
+  'ￂ' => 'ᅡ',
+  'ￃ' => 'ᅢ',
+  'ￄ' => 'ᅣ',
+  'ￅ' => 'ᅤ',
+  'ￆ' => 'ᅥ',
+  'ￇ' => 'ᅦ',
+  'ￊ' => 'ᅧ',
+  'ￋ' => 'ᅨ',
+  'ￌ' => 'ᅩ',
+  'ￍ' => 'ᅪ',
+  'ￎ' => 'ᅫ',
+  'ￏ' => 'ᅬ',
+  'ￒ' => 'ᅭ',
+  'ￓ' => 'ᅮ',
+  'ￔ' => 'ᅯ',
+  'ￕ' => 'ᅰ',
+  'ￖ' => 'ᅱ',
+  'ￗ' => 'ᅲ',
+  'ￚ' => 'ᅳ',
+  'ￛ' => 'ᅴ',
+  'ￜ' => 'ᅵ',
+  '￠' => '¢',
+  '￡' => '£',
+  '￢' => '¬',
+  '￣' => ' ̄',
+  '￤' => '¦',
+  '￥' => '¥',
+  '￦' => '₩',
+  '￨' => '│',
+  '￩' => '←',
+  '￪' => '↑',
+  '￫' => '→',
+  '￬' => '↓',
+  '￭' => '■',
+  '￮' => '○',
+  '𝐀' => 'A',
+  '𝐁' => 'B',
+  '𝐂' => 'C',
+  '𝐃' => 'D',
+  '𝐄' => 'E',
+  '𝐅' => 'F',
+  '𝐆' => 'G',
+  '𝐇' => 'H',
+  '𝐈' => 'I',
+  '𝐉' => 'J',
+  '𝐊' => 'K',
+  '𝐋' => 'L',
+  '𝐌' => 'M',
+  '𝐍' => 'N',
+  '𝐎' => 'O',
+  '𝐏' => 'P',
+  '𝐐' => 'Q',
+  '𝐑' => 'R',
+  '𝐒' => 'S',
+  '𝐓' => 'T',
+  '𝐔' => 'U',
+  '𝐕' => 'V',
+  '𝐖' => 'W',
+  '𝐗' => 'X',
+  '𝐘' => 'Y',
+  '𝐙' => 'Z',
+  '𝐚' => 'a',
+  '𝐛' => 'b',
+  '𝐜' => 'c',
+  '𝐝' => 'd',
+  '𝐞' => 'e',
+  '𝐟' => 'f',
+  '𝐠' => 'g',
+  '𝐡' => 'h',
+  '𝐢' => 'i',
+  '𝐣' => 'j',
+  '𝐤' => 'k',
+  '𝐥' => 'l',
+  '𝐦' => 'm',
+  '𝐧' => 'n',
+  '𝐨' => 'o',
+  '𝐩' => 'p',
+  '𝐪' => 'q',
+  '𝐫' => 'r',
+  '𝐬' => 's',
+  '𝐭' => 't',
+  '𝐮' => 'u',
+  '𝐯' => 'v',
+  '𝐰' => 'w',
+  '𝐱' => 'x',
+  '𝐲' => 'y',
+  '𝐳' => 'z',
+  '𝐴' => 'A',
+  '𝐵' => 'B',
+  '𝐶' => 'C',
+  '𝐷' => 'D',
+  '𝐸' => 'E',
+  '𝐹' => 'F',
+  '𝐺' => 'G',
+  '𝐻' => 'H',
+  '𝐼' => 'I',
+  '𝐽' => 'J',
+  '𝐾' => 'K',
+  '𝐿' => 'L',
+  '𝑀' => 'M',
+  '𝑁' => 'N',
+  '𝑂' => 'O',
+  '𝑃' => 'P',
+  '𝑄' => 'Q',
+  '𝑅' => 'R',
+  '𝑆' => 'S',
+  '𝑇' => 'T',
+  '𝑈' => 'U',
+  '𝑉' => 'V',
+  '𝑊' => 'W',
+  '𝑋' => 'X',
+  '𝑌' => 'Y',
+  '𝑍' => 'Z',
+  '𝑎' => 'a',
+  '𝑏' => 'b',
+  '𝑐' => 'c',
+  '𝑑' => 'd',
+  '𝑒' => 'e',
+  '𝑓' => 'f',
+  '𝑔' => 'g',
+  '𝑖' => 'i',
+  '𝑗' => 'j',
+  '𝑘' => 'k',
+  '𝑙' => 'l',
+  '𝑚' => 'm',
+  '𝑛' => 'n',
+  '𝑜' => 'o',
+  '𝑝' => 'p',
+  '𝑞' => 'q',
+  '𝑟' => 'r',
+  '𝑠' => 's',
+  '𝑡' => 't',
+  '𝑢' => 'u',
+  '𝑣' => 'v',
+  '𝑤' => 'w',
+  '𝑥' => 'x',
+  '𝑦' => 'y',
+  '𝑧' => 'z',
+  '𝑨' => 'A',
+  '𝑩' => 'B',
+  '𝑪' => 'C',
+  '𝑫' => 'D',
+  '𝑬' => 'E',
+  '𝑭' => 'F',
+  '𝑮' => 'G',
+  '𝑯' => 'H',
+  '𝑰' => 'I',
+  '𝑱' => 'J',
+  '𝑲' => 'K',
+  '𝑳' => 'L',
+  '𝑴' => 'M',
+  '𝑵' => 'N',
+  '𝑶' => 'O',
+  '𝑷' => 'P',
+  '𝑸' => 'Q',
+  '𝑹' => 'R',
+  '𝑺' => 'S',
+  '𝑻' => 'T',
+  '𝑼' => 'U',
+  '𝑽' => 'V',
+  '𝑾' => 'W',
+  '𝑿' => 'X',
+  '𝒀' => 'Y',
+  '𝒁' => 'Z',
+  '𝒂' => 'a',
+  '𝒃' => 'b',
+  '𝒄' => 'c',
+  '𝒅' => 'd',
+  '𝒆' => 'e',
+  '𝒇' => 'f',
+  '𝒈' => 'g',
+  '𝒉' => 'h',
+  '𝒊' => 'i',
+  '𝒋' => 'j',
+  '𝒌' => 'k',
+  '𝒍' => 'l',
+  '𝒎' => 'm',
+  '𝒏' => 'n',
+  '𝒐' => 'o',
+  '𝒑' => 'p',
+  '𝒒' => 'q',
+  '𝒓' => 'r',
+  '𝒔' => 's',
+  '𝒕' => 't',
+  '𝒖' => 'u',
+  '𝒗' => 'v',
+  '𝒘' => 'w',
+  '𝒙' => 'x',
+  '𝒚' => 'y',
+  '𝒛' => 'z',
+  '𝒜' => 'A',
+  '𝒞' => 'C',
+  '𝒟' => 'D',
+  '𝒢' => 'G',
+  '𝒥' => 'J',
+  '𝒦' => 'K',
+  '𝒩' => 'N',
+  '𝒪' => 'O',
+  '𝒫' => 'P',
+  '𝒬' => 'Q',
+  '𝒮' => 'S',
+  '𝒯' => 'T',
+  '𝒰' => 'U',
+  '𝒱' => 'V',
+  '𝒲' => 'W',
+  '𝒳' => 'X',
+  '𝒴' => 'Y',
+  '𝒵' => 'Z',
+  '𝒶' => 'a',
+  '𝒷' => 'b',
+  '𝒸' => 'c',
+  '𝒹' => 'd',
+  '𝒻' => 'f',
+  '𝒽' => 'h',
+  '𝒾' => 'i',
+  '𝒿' => 'j',
+  '𝓀' => 'k',
+  '𝓁' => 'l',
+  '𝓂' => 'm',
+  '𝓃' => 'n',
+  '𝓅' => 'p',
+  '𝓆' => 'q',
+  '𝓇' => 'r',
+  '𝓈' => 's',
+  '𝓉' => 't',
+  '𝓊' => 'u',
+  '𝓋' => 'v',
+  '𝓌' => 'w',
+  '𝓍' => 'x',
+  '𝓎' => 'y',
+  '𝓏' => 'z',
+  '𝓐' => 'A',
+  '𝓑' => 'B',
+  '𝓒' => 'C',
+  '𝓓' => 'D',
+  '𝓔' => 'E',
+  '𝓕' => 'F',
+  '𝓖' => 'G',
+  '𝓗' => 'H',
+  '𝓘' => 'I',
+  '𝓙' => 'J',
+  '𝓚' => 'K',
+  '𝓛' => 'L',
+  '𝓜' => 'M',
+  '𝓝' => 'N',
+  '𝓞' => 'O',
+  '𝓟' => 'P',
+  '𝓠' => 'Q',
+  '𝓡' => 'R',
+  '𝓢' => 'S',
+  '𝓣' => 'T',
+  '𝓤' => 'U',
+  '𝓥' => 'V',
+  '𝓦' => 'W',
+  '𝓧' => 'X',
+  '𝓨' => 'Y',
+  '𝓩' => 'Z',
+  '𝓪' => 'a',
+  '𝓫' => 'b',
+  '𝓬' => 'c',
+  '𝓭' => 'd',
+  '𝓮' => 'e',
+  '𝓯' => 'f',
+  '𝓰' => 'g',
+  '𝓱' => 'h',
+  '𝓲' => 'i',
+  '𝓳' => 'j',
+  '𝓴' => 'k',
+  '𝓵' => 'l',
+  '𝓶' => 'm',
+  '𝓷' => 'n',
+  '𝓸' => 'o',
+  '𝓹' => 'p',
+  '𝓺' => 'q',
+  '𝓻' => 'r',
+  '𝓼' => 's',
+  '𝓽' => 't',
+  '𝓾' => 'u',
+  '𝓿' => 'v',
+  '𝔀' => 'w',
+  '𝔁' => 'x',
+  '𝔂' => 'y',
+  '𝔃' => 'z',
+  '𝔄' => 'A',
+  '𝔅' => 'B',
+  '𝔇' => 'D',
+  '𝔈' => 'E',
+  '𝔉' => 'F',
+  '𝔊' => 'G',
+  '𝔍' => 'J',
+  '𝔎' => 'K',
+  '𝔏' => 'L',
+  '𝔐' => 'M',
+  '𝔑' => 'N',
+  '𝔒' => 'O',
+  '𝔓' => 'P',
+  '𝔔' => 'Q',
+  '𝔖' => 'S',
+  '𝔗' => 'T',
+  '𝔘' => 'U',
+  '𝔙' => 'V',
+  '𝔚' => 'W',
+  '𝔛' => 'X',
+  '𝔜' => 'Y',
+  '𝔞' => 'a',
+  '𝔟' => 'b',
+  '𝔠' => 'c',
+  '𝔡' => 'd',
+  '𝔢' => 'e',
+  '𝔣' => 'f',
+  '𝔤' => 'g',
+  '𝔥' => 'h',
+  '𝔦' => 'i',
+  '𝔧' => 'j',
+  '𝔨' => 'k',
+  '𝔩' => 'l',
+  '𝔪' => 'm',
+  '𝔫' => 'n',
+  '𝔬' => 'o',
+  '𝔭' => 'p',
+  '𝔮' => 'q',
+  '𝔯' => 'r',
+  '𝔰' => 's',
+  '𝔱' => 't',
+  '𝔲' => 'u',
+  '𝔳' => 'v',
+  '𝔴' => 'w',
+  '𝔵' => 'x',
+  '𝔶' => 'y',
+  '𝔷' => 'z',
+  '𝔸' => 'A',
+  '𝔹' => 'B',
+  '𝔻' => 'D',
+  '𝔼' => 'E',
+  '𝔽' => 'F',
+  '𝔾' => 'G',
+  '𝕀' => 'I',
+  '𝕁' => 'J',
+  '𝕂' => 'K',
+  '𝕃' => 'L',
+  '𝕄' => 'M',
+  '𝕆' => 'O',
+  '𝕊' => 'S',
+  '𝕋' => 'T',
+  '𝕌' => 'U',
+  '𝕍' => 'V',
+  '𝕎' => 'W',
+  '𝕏' => 'X',
+  '𝕐' => 'Y',
+  '𝕒' => 'a',
+  '𝕓' => 'b',
+  '𝕔' => 'c',
+  '𝕕' => 'd',
+  '𝕖' => 'e',
+  '𝕗' => 'f',
+  '𝕘' => 'g',
+  '𝕙' => 'h',
+  '𝕚' => 'i',
+  '𝕛' => 'j',
+  '𝕜' => 'k',
+  '𝕝' => 'l',
+  '𝕞' => 'm',
+  '𝕟' => 'n',
+  '𝕠' => 'o',
+  '𝕡' => 'p',
+  '𝕢' => 'q',
+  '𝕣' => 'r',
+  '𝕤' => 's',
+  '𝕥' => 't',
+  '𝕦' => 'u',
+  '𝕧' => 'v',
+  '𝕨' => 'w',
+  '𝕩' => 'x',
+  '𝕪' => 'y',
+  '𝕫' => 'z',
+  '𝕬' => 'A',
+  '𝕭' => 'B',
+  '𝕮' => 'C',
+  '𝕯' => 'D',
+  '𝕰' => 'E',
+  '𝕱' => 'F',
+  '𝕲' => 'G',
+  '𝕳' => 'H',
+  '𝕴' => 'I',
+  '𝕵' => 'J',
+  '𝕶' => 'K',
+  '𝕷' => 'L',
+  '𝕸' => 'M',
+  '𝕹' => 'N',
+  '𝕺' => 'O',
+  '𝕻' => 'P',
+  '𝕼' => 'Q',
+  '𝕽' => 'R',
+  '𝕾' => 'S',
+  '𝕿' => 'T',
+  '𝖀' => 'U',
+  '𝖁' => 'V',
+  '𝖂' => 'W',
+  '𝖃' => 'X',
+  '𝖄' => 'Y',
+  '𝖅' => 'Z',
+  '𝖆' => 'a',
+  '𝖇' => 'b',
+  '𝖈' => 'c',
+  '𝖉' => 'd',
+  '𝖊' => 'e',
+  '𝖋' => 'f',
+  '𝖌' => 'g',
+  '𝖍' => 'h',
+  '𝖎' => 'i',
+  '𝖏' => 'j',
+  '𝖐' => 'k',
+  '𝖑' => 'l',
+  '𝖒' => 'm',
+  '𝖓' => 'n',
+  '𝖔' => 'o',
+  '𝖕' => 'p',
+  '𝖖' => 'q',
+  '𝖗' => 'r',
+  '𝖘' => 's',
+  '𝖙' => 't',
+  '𝖚' => 'u',
+  '𝖛' => 'v',
+  '𝖜' => 'w',
+  '𝖝' => 'x',
+  '𝖞' => 'y',
+  '𝖟' => 'z',
+  '𝖠' => 'A',
+  '𝖡' => 'B',
+  '𝖢' => 'C',
+  '𝖣' => 'D',
+  '𝖤' => 'E',
+  '𝖥' => 'F',
+  '𝖦' => 'G',
+  '𝖧' => 'H',
+  '𝖨' => 'I',
+  '𝖩' => 'J',
+  '𝖪' => 'K',
+  '𝖫' => 'L',
+  '𝖬' => 'M',
+  '𝖭' => 'N',
+  '𝖮' => 'O',
+  '𝖯' => 'P',
+  '𝖰' => 'Q',
+  '𝖱' => 'R',
+  '𝖲' => 'S',
+  '𝖳' => 'T',
+  '𝖴' => 'U',
+  '𝖵' => 'V',
+  '𝖶' => 'W',
+  '𝖷' => 'X',
+  '𝖸' => 'Y',
+  '𝖹' => 'Z',
+  '𝖺' => 'a',
+  '𝖻' => 'b',
+  '𝖼' => 'c',
+  '𝖽' => 'd',
+  '𝖾' => 'e',
+  '𝖿' => 'f',
+  '𝗀' => 'g',
+  '𝗁' => 'h',
+  '𝗂' => 'i',
+  '𝗃' => 'j',
+  '𝗄' => 'k',
+  '𝗅' => 'l',
+  '𝗆' => 'm',
+  '𝗇' => 'n',
+  '𝗈' => 'o',
+  '𝗉' => 'p',
+  '𝗊' => 'q',
+  '𝗋' => 'r',
+  '𝗌' => 's',
+  '𝗍' => 't',
+  '𝗎' => 'u',
+  '𝗏' => 'v',
+  '𝗐' => 'w',
+  '𝗑' => 'x',
+  '𝗒' => 'y',
+  '𝗓' => 'z',
+  '𝗔' => 'A',
+  '𝗕' => 'B',
+  '𝗖' => 'C',
+  '𝗗' => 'D',
+  '𝗘' => 'E',
+  '𝗙' => 'F',
+  '𝗚' => 'G',
+  '𝗛' => 'H',
+  '𝗜' => 'I',
+  '𝗝' => 'J',
+  '𝗞' => 'K',
+  '𝗟' => 'L',
+  '𝗠' => 'M',
+  '𝗡' => 'N',
+  '𝗢' => 'O',
+  '𝗣' => 'P',
+  '𝗤' => 'Q',
+  '𝗥' => 'R',
+  '𝗦' => 'S',
+  '𝗧' => 'T',
+  '𝗨' => 'U',
+  '𝗩' => 'V',
+  '𝗪' => 'W',
+  '𝗫' => 'X',
+  '𝗬' => 'Y',
+  '𝗭' => 'Z',
+  '𝗮' => 'a',
+  '𝗯' => 'b',
+  '𝗰' => 'c',
+  '𝗱' => 'd',
+  '𝗲' => 'e',
+  '𝗳' => 'f',
+  '𝗴' => 'g',
+  '𝗵' => 'h',
+  '𝗶' => 'i',
+  '𝗷' => 'j',
+  '𝗸' => 'k',
+  '𝗹' => 'l',
+  '𝗺' => 'm',
+  '𝗻' => 'n',
+  '𝗼' => 'o',
+  '𝗽' => 'p',
+  '𝗾' => 'q',
+  '𝗿' => 'r',
+  '𝘀' => 's',
+  '𝘁' => 't',
+  '𝘂' => 'u',
+  '𝘃' => 'v',
+  '𝘄' => 'w',
+  '𝘅' => 'x',
+  '𝘆' => 'y',
+  '𝘇' => 'z',
+  '𝘈' => 'A',
+  '𝘉' => 'B',
+  '𝘊' => 'C',
+  '𝘋' => 'D',
+  '𝘌' => 'E',
+  '𝘍' => 'F',
+  '𝘎' => 'G',
+  '𝘏' => 'H',
+  '𝘐' => 'I',
+  '𝘑' => 'J',
+  '𝘒' => 'K',
+  '𝘓' => 'L',
+  '𝘔' => 'M',
+  '𝘕' => 'N',
+  '𝘖' => 'O',
+  '𝘗' => 'P',
+  '𝘘' => 'Q',
+  '𝘙' => 'R',
+  '𝘚' => 'S',
+  '𝘛' => 'T',
+  '𝘜' => 'U',
+  '𝘝' => 'V',
+  '𝘞' => 'W',
+  '𝘟' => 'X',
+  '𝘠' => 'Y',
+  '𝘡' => 'Z',
+  '𝘢' => 'a',
+  '𝘣' => 'b',
+  '𝘤' => 'c',
+  '𝘥' => 'd',
+  '𝘦' => 'e',
+  '𝘧' => 'f',
+  '𝘨' => 'g',
+  '𝘩' => 'h',
+  '𝘪' => 'i',
+  '𝘫' => 'j',
+  '𝘬' => 'k',
+  '𝘭' => 'l',
+  '𝘮' => 'm',
+  '𝘯' => 'n',
+  '𝘰' => 'o',
+  '𝘱' => 'p',
+  '𝘲' => 'q',
+  '𝘳' => 'r',
+  '𝘴' => 's',
+  '𝘵' => 't',
+  '𝘶' => 'u',
+  '𝘷' => 'v',
+  '𝘸' => 'w',
+  '𝘹' => 'x',
+  '𝘺' => 'y',
+  '𝘻' => 'z',
+  '𝘼' => 'A',
+  '𝘽' => 'B',
+  '𝘾' => 'C',
+  '𝘿' => 'D',
+  '𝙀' => 'E',
+  '𝙁' => 'F',
+  '𝙂' => 'G',
+  '𝙃' => 'H',
+  '𝙄' => 'I',
+  '𝙅' => 'J',
+  '𝙆' => 'K',
+  '𝙇' => 'L',
+  '𝙈' => 'M',
+  '𝙉' => 'N',
+  '𝙊' => 'O',
+  '𝙋' => 'P',
+  '𝙌' => 'Q',
+  '𝙍' => 'R',
+  '𝙎' => 'S',
+  '𝙏' => 'T',
+  '𝙐' => 'U',
+  '𝙑' => 'V',
+  '𝙒' => 'W',
+  '𝙓' => 'X',
+  '𝙔' => 'Y',
+  '𝙕' => 'Z',
+  '𝙖' => 'a',
+  '𝙗' => 'b',
+  '𝙘' => 'c',
+  '𝙙' => 'd',
+  '𝙚' => 'e',
+  '𝙛' => 'f',
+  '𝙜' => 'g',
+  '𝙝' => 'h',
+  '𝙞' => 'i',
+  '𝙟' => 'j',
+  '𝙠' => 'k',
+  '𝙡' => 'l',
+  '𝙢' => 'm',
+  '𝙣' => 'n',
+  '𝙤' => 'o',
+  '𝙥' => 'p',
+  '𝙦' => 'q',
+  '𝙧' => 'r',
+  '𝙨' => 's',
+  '𝙩' => 't',
+  '𝙪' => 'u',
+  '𝙫' => 'v',
+  '𝙬' => 'w',
+  '𝙭' => 'x',
+  '𝙮' => 'y',
+  '𝙯' => 'z',
+  '𝙰' => 'A',
+  '𝙱' => 'B',
+  '𝙲' => 'C',
+  '𝙳' => 'D',
+  '𝙴' => 'E',
+  '𝙵' => 'F',
+  '𝙶' => 'G',
+  '𝙷' => 'H',
+  '𝙸' => 'I',
+  '𝙹' => 'J',
+  '𝙺' => 'K',
+  '𝙻' => 'L',
+  '𝙼' => 'M',
+  '𝙽' => 'N',
+  '𝙾' => 'O',
+  '𝙿' => 'P',
+  '𝚀' => 'Q',
+  '𝚁' => 'R',
+  '𝚂' => 'S',
+  '𝚃' => 'T',
+  '𝚄' => 'U',
+  '𝚅' => 'V',
+  '𝚆' => 'W',
+  '𝚇' => 'X',
+  '𝚈' => 'Y',
+  '𝚉' => 'Z',
+  '𝚊' => 'a',
+  '𝚋' => 'b',
+  '𝚌' => 'c',
+  '𝚍' => 'd',
+  '𝚎' => 'e',
+  '𝚏' => 'f',
+  '𝚐' => 'g',
+  '𝚑' => 'h',
+  '𝚒' => 'i',
+  '𝚓' => 'j',
+  '𝚔' => 'k',
+  '𝚕' => 'l',
+  '𝚖' => 'm',
+  '𝚗' => 'n',
+  '𝚘' => 'o',
+  '𝚙' => 'p',
+  '𝚚' => 'q',
+  '𝚛' => 'r',
+  '𝚜' => 's',
+  '𝚝' => 't',
+  '𝚞' => 'u',
+  '𝚟' => 'v',
+  '𝚠' => 'w',
+  '𝚡' => 'x',
+  '𝚢' => 'y',
+  '𝚣' => 'z',
+  '𝚤' => 'ı',
+  '𝚥' => 'ȷ',
+  '𝚨' => 'Α',
+  '𝚩' => 'Β',
+  '𝚪' => 'Γ',
+  '𝚫' => 'Δ',
+  '𝚬' => 'Ε',
+  '𝚭' => 'Ζ',
+  '𝚮' => 'Η',
+  '𝚯' => 'Θ',
+  '𝚰' => 'Ι',
+  '𝚱' => 'Κ',
+  '𝚲' => 'Λ',
+  '𝚳' => 'Μ',
+  '𝚴' => 'Ν',
+  '𝚵' => 'Ξ',
+  '𝚶' => 'Ο',
+  '𝚷' => 'Π',
+  '𝚸' => 'Ρ',
+  '𝚹' => 'Θ',
+  '𝚺' => 'Σ',
+  '𝚻' => 'Τ',
+  '𝚼' => 'Υ',
+  '𝚽' => 'Φ',
+  '𝚾' => 'Χ',
+  '𝚿' => 'Ψ',
+  '𝛀' => 'Ω',
+  '𝛁' => '∇',
+  '𝛂' => 'α',
+  '𝛃' => 'β',
+  '𝛄' => 'γ',
+  '𝛅' => 'δ',
+  '𝛆' => 'ε',
+  '𝛇' => 'ζ',
+  '𝛈' => 'η',
+  '𝛉' => 'θ',
+  '𝛊' => 'ι',
+  '𝛋' => 'κ',
+  '𝛌' => 'λ',
+  '𝛍' => 'μ',
+  '𝛎' => 'ν',
+  '𝛏' => 'ξ',
+  '𝛐' => 'ο',
+  '𝛑' => 'π',
+  '𝛒' => 'ρ',
+  '𝛓' => 'ς',
+  '𝛔' => 'σ',
+  '𝛕' => 'τ',
+  '𝛖' => 'υ',
+  '𝛗' => 'φ',
+  '𝛘' => 'χ',
+  '𝛙' => 'ψ',
+  '𝛚' => 'ω',
+  '𝛛' => '∂',
+  '𝛜' => 'ε',
+  '𝛝' => 'θ',
+  '𝛞' => 'κ',
+  '𝛟' => 'φ',
+  '𝛠' => 'ρ',
+  '𝛡' => 'π',
+  '𝛢' => 'Α',
+  '𝛣' => 'Β',
+  '𝛤' => 'Γ',
+  '𝛥' => 'Δ',
+  '𝛦' => 'Ε',
+  '𝛧' => 'Ζ',
+  '𝛨' => 'Η',
+  '𝛩' => 'Θ',
+  '𝛪' => 'Ι',
+  '𝛫' => 'Κ',
+  '𝛬' => 'Λ',
+  '𝛭' => 'Μ',
+  '𝛮' => 'Ν',
+  '𝛯' => 'Ξ',
+  '𝛰' => 'Ο',
+  '𝛱' => 'Π',
+  '𝛲' => 'Ρ',
+  '𝛳' => 'Θ',
+  '𝛴' => 'Σ',
+  '𝛵' => 'Τ',
+  '𝛶' => 'Υ',
+  '𝛷' => 'Φ',
+  '𝛸' => 'Χ',
+  '𝛹' => 'Ψ',
+  '𝛺' => 'Ω',
+  '𝛻' => '∇',
+  '𝛼' => 'α',
+  '𝛽' => 'β',
+  '𝛾' => 'γ',
+  '𝛿' => 'δ',
+  '𝜀' => 'ε',
+  '𝜁' => 'ζ',
+  '𝜂' => 'η',
+  '𝜃' => 'θ',
+  '𝜄' => 'ι',
+  '𝜅' => 'κ',
+  '𝜆' => 'λ',
+  '𝜇' => 'μ',
+  '𝜈' => 'ν',
+  '𝜉' => 'ξ',
+  '𝜊' => 'ο',
+  '𝜋' => 'π',
+  '𝜌' => 'ρ',
+  '𝜍' => 'ς',
+  '𝜎' => 'σ',
+  '𝜏' => 'τ',
+  '𝜐' => 'υ',
+  '𝜑' => 'φ',
+  '𝜒' => 'χ',
+  '𝜓' => 'ψ',
+  '𝜔' => 'ω',
+  '𝜕' => '∂',
+  '𝜖' => 'ε',
+  '𝜗' => 'θ',
+  '𝜘' => 'κ',
+  '𝜙' => 'φ',
+  '𝜚' => 'ρ',
+  '𝜛' => 'π',
+  '𝜜' => 'Α',
+  '𝜝' => 'Β',
+  '𝜞' => 'Γ',
+  '𝜟' => 'Δ',
+  '𝜠' => 'Ε',
+  '𝜡' => 'Ζ',
+  '𝜢' => 'Η',
+  '𝜣' => 'Θ',
+  '𝜤' => 'Ι',
+  '𝜥' => 'Κ',
+  '𝜦' => 'Λ',
+  '𝜧' => 'Μ',
+  '𝜨' => 'Ν',
+  '𝜩' => 'Ξ',
+  '𝜪' => 'Ο',
+  '𝜫' => 'Π',
+  '𝜬' => 'Ρ',
+  '𝜭' => 'Θ',
+  '𝜮' => 'Σ',
+  '𝜯' => 'Τ',
+  '𝜰' => 'Υ',
+  '𝜱' => 'Φ',
+  '𝜲' => 'Χ',
+  '𝜳' => 'Ψ',
+  '𝜴' => 'Ω',
+  '𝜵' => '∇',
+  '𝜶' => 'α',
+  '𝜷' => 'β',
+  '𝜸' => 'γ',
+  '𝜹' => 'δ',
+  '𝜺' => 'ε',
+  '𝜻' => 'ζ',
+  '𝜼' => 'η',
+  '𝜽' => 'θ',
+  '𝜾' => 'ι',
+  '𝜿' => 'κ',
+  '𝝀' => 'λ',
+  '𝝁' => 'μ',
+  '𝝂' => 'ν',
+  '𝝃' => 'ξ',
+  '𝝄' => 'ο',
+  '𝝅' => 'π',
+  '𝝆' => 'ρ',
+  '𝝇' => 'ς',
+  '𝝈' => 'σ',
+  '𝝉' => 'τ',
+  '𝝊' => 'υ',
+  '𝝋' => 'φ',
+  '𝝌' => 'χ',
+  '𝝍' => 'ψ',
+  '𝝎' => 'ω',
+  '𝝏' => '∂',
+  '𝝐' => 'ε',
+  '𝝑' => 'θ',
+  '𝝒' => 'κ',
+  '𝝓' => 'φ',
+  '𝝔' => 'ρ',
+  '𝝕' => 'π',
+  '𝝖' => 'Α',
+  '𝝗' => 'Β',
+  '𝝘' => 'Γ',
+  '𝝙' => 'Δ',
+  '𝝚' => 'Ε',
+  '𝝛' => 'Ζ',
+  '𝝜' => 'Η',
+  '𝝝' => 'Θ',
+  '𝝞' => 'Ι',
+  '𝝟' => 'Κ',
+  '𝝠' => 'Λ',
+  '𝝡' => 'Μ',
+  '𝝢' => 'Ν',
+  '𝝣' => 'Ξ',
+  '𝝤' => 'Ο',
+  '𝝥' => 'Π',
+  '𝝦' => 'Ρ',
+  '𝝧' => 'Θ',
+  '𝝨' => 'Σ',
+  '𝝩' => 'Τ',
+  '𝝪' => 'Υ',
+  '𝝫' => 'Φ',
+  '𝝬' => 'Χ',
+  '𝝭' => 'Ψ',
+  '𝝮' => 'Ω',
+  '𝝯' => '∇',
+  '𝝰' => 'α',
+  '𝝱' => 'β',
+  '𝝲' => 'γ',
+  '𝝳' => 'δ',
+  '𝝴' => 'ε',
+  '𝝵' => 'ζ',
+  '𝝶' => 'η',
+  '𝝷' => 'θ',
+  '𝝸' => 'ι',
+  '𝝹' => 'κ',
+  '𝝺' => 'λ',
+  '𝝻' => 'μ',
+  '𝝼' => 'ν',
+  '𝝽' => 'ξ',
+  '𝝾' => 'ο',
+  '𝝿' => 'π',
+  '𝞀' => 'ρ',
+  '𝞁' => 'ς',
+  '𝞂' => 'σ',
+  '𝞃' => 'τ',
+  '𝞄' => 'υ',
+  '𝞅' => 'φ',
+  '𝞆' => 'χ',
+  '𝞇' => 'ψ',
+  '𝞈' => 'ω',
+  '𝞉' => '∂',
+  '𝞊' => 'ε',
+  '𝞋' => 'θ',
+  '𝞌' => 'κ',
+  '𝞍' => 'φ',
+  '𝞎' => 'ρ',
+  '𝞏' => 'π',
+  '𝞐' => 'Α',
+  '𝞑' => 'Β',
+  '𝞒' => 'Γ',
+  '𝞓' => 'Δ',
+  '𝞔' => 'Ε',
+  '𝞕' => 'Ζ',
+  '𝞖' => 'Η',
+  '𝞗' => 'Θ',
+  '𝞘' => 'Ι',
+  '𝞙' => 'Κ',
+  '𝞚' => 'Λ',
+  '𝞛' => 'Μ',
+  '𝞜' => 'Ν',
+  '𝞝' => 'Ξ',
+  '𝞞' => 'Ο',
+  '𝞟' => 'Π',
+  '𝞠' => 'Ρ',
+  '𝞡' => 'Θ',
+  '𝞢' => 'Σ',
+  '𝞣' => 'Τ',
+  '𝞤' => 'Υ',
+  '𝞥' => 'Φ',
+  '𝞦' => 'Χ',
+  '𝞧' => 'Ψ',
+  '𝞨' => 'Ω',
+  '𝞩' => '∇',
+  '𝞪' => 'α',
+  '𝞫' => 'β',
+  '𝞬' => 'γ',
+  '𝞭' => 'δ',
+  '𝞮' => 'ε',
+  '𝞯' => 'ζ',
+  '𝞰' => 'η',
+  '𝞱' => 'θ',
+  '𝞲' => 'ι',
+  '𝞳' => 'κ',
+  '𝞴' => 'λ',
+  '𝞵' => 'μ',
+  '𝞶' => 'ν',
+  '𝞷' => 'ξ',
+  '𝞸' => 'ο',
+  '𝞹' => 'π',
+  '𝞺' => 'ρ',
+  '𝞻' => 'ς',
+  '𝞼' => 'σ',
+  '𝞽' => 'τ',
+  '𝞾' => 'υ',
+  '𝞿' => 'φ',
+  '𝟀' => 'χ',
+  '𝟁' => 'ψ',
+  '𝟂' => 'ω',
+  '𝟃' => '∂',
+  '𝟄' => 'ε',
+  '𝟅' => 'θ',
+  '𝟆' => 'κ',
+  '𝟇' => 'φ',
+  '𝟈' => 'ρ',
+  '𝟉' => 'π',
+  '𝟊' => 'Ϝ',
+  '𝟋' => 'ϝ',
+  '𝟎' => '0',
+  '𝟏' => '1',
+  '𝟐' => '2',
+  '𝟑' => '3',
+  '𝟒' => '4',
+  '𝟓' => '5',
+  '𝟔' => '6',
+  '𝟕' => '7',
+  '𝟖' => '8',
+  '𝟗' => '9',
+  '𝟘' => '0',
+  '𝟙' => '1',
+  '𝟚' => '2',
+  '𝟛' => '3',
+  '𝟜' => '4',
+  '𝟝' => '5',
+  '𝟞' => '6',
+  '𝟟' => '7',
+  '𝟠' => '8',
+  '𝟡' => '9',
+  '𝟢' => '0',
+  '𝟣' => '1',
+  '𝟤' => '2',
+  '𝟥' => '3',
+  '𝟦' => '4',
+  '𝟧' => '5',
+  '𝟨' => '6',
+  '𝟩' => '7',
+  '𝟪' => '8',
+  '𝟫' => '9',
+  '𝟬' => '0',
+  '𝟭' => '1',
+  '𝟮' => '2',
+  '𝟯' => '3',
+  '𝟰' => '4',
+  '𝟱' => '5',
+  '𝟲' => '6',
+  '𝟳' => '7',
+  '𝟴' => '8',
+  '𝟵' => '9',
+  '𝟶' => '0',
+  '𝟷' => '1',
+  '𝟸' => '2',
+  '𝟹' => '3',
+  '𝟺' => '4',
+  '𝟻' => '5',
+  '𝟼' => '6',
+  '𝟽' => '7',
+  '𝟾' => '8',
+  '𝟿' => '9',
+  '𞸀' => 'ا',
+  '𞸁' => 'ب',
+  '𞸂' => 'ج',
+  '𞸃' => 'د',
+  '𞸅' => 'و',
+  '𞸆' => 'ز',
+  '𞸇' => 'ح',
+  '𞸈' => 'ط',
+  '𞸉' => 'ي',
+  '𞸊' => 'ك',
+  '𞸋' => 'ل',
+  '𞸌' => 'م',
+  '𞸍' => 'ن',
+  '𞸎' => 'س',
+  '𞸏' => 'ع',
+  '𞸐' => 'ف',
+  '𞸑' => 'ص',
+  '𞸒' => 'ق',
+  '𞸓' => 'ر',
+  '𞸔' => 'ش',
+  '𞸕' => 'ت',
+  '𞸖' => 'ث',
+  '𞸗' => 'خ',
+  '𞸘' => 'ذ',
+  '𞸙' => 'ض',
+  '𞸚' => 'ظ',
+  '𞸛' => 'غ',
+  '𞸜' => 'ٮ',
+  '𞸝' => 'ں',
+  '𞸞' => 'ڡ',
+  '𞸟' => 'ٯ',
+  '𞸡' => 'ب',
+  '𞸢' => 'ج',
+  '𞸤' => 'ه',
+  '𞸧' => 'ح',
+  '𞸩' => 'ي',
+  '𞸪' => 'ك',
+  '𞸫' => 'ل',
+  '𞸬' => 'م',
+  '𞸭' => 'ن',
+  '𞸮' => 'س',
+  '𞸯' => 'ع',
+  '𞸰' => 'ف',
+  '𞸱' => 'ص',
+  '𞸲' => 'ق',
+  '𞸴' => 'ش',
+  '𞸵' => 'ت',
+  '𞸶' => 'ث',
+  '𞸷' => 'خ',
+  '𞸹' => 'ض',
+  '𞸻' => 'غ',
+  '𞹂' => 'ج',
+  '𞹇' => 'ح',
+  '𞹉' => 'ي',
+  '𞹋' => 'ل',
+  '𞹍' => 'ن',
+  '𞹎' => 'س',
+  '𞹏' => 'ع',
+  '𞹑' => 'ص',
+  '𞹒' => 'ق',
+  '𞹔' => 'ش',
+  '𞹗' => 'خ',
+  '𞹙' => 'ض',
+  '𞹛' => 'غ',
+  '𞹝' => 'ں',
+  '𞹟' => 'ٯ',
+  '𞹡' => 'ب',
+  '𞹢' => 'ج',
+  '𞹤' => 'ه',
+  '𞹧' => 'ح',
+  '𞹨' => 'ط',
+  '𞹩' => 'ي',
+  '𞹪' => 'ك',
+  '𞹬' => 'م',
+  '𞹭' => 'ن',
+  '𞹮' => 'س',
+  '𞹯' => 'ع',
+  '𞹰' => 'ف',
+  '𞹱' => 'ص',
+  '𞹲' => 'ق',
+  '𞹴' => 'ش',
+  '𞹵' => 'ت',
+  '𞹶' => 'ث',
+  '𞹷' => 'خ',
+  '𞹹' => 'ض',
+  '𞹺' => 'ظ',
+  '𞹻' => 'غ',
+  '𞹼' => 'ٮ',
+  '𞹾' => 'ڡ',
+  '𞺀' => 'ا',
+  '𞺁' => 'ب',
+  '𞺂' => 'ج',
+  '𞺃' => 'د',
+  '𞺄' => 'ه',
+  '𞺅' => 'و',
+  '𞺆' => 'ز',
+  '𞺇' => 'ح',
+  '𞺈' => 'ط',
+  '𞺉' => 'ي',
+  '𞺋' => 'ل',
+  '𞺌' => 'م',
+  '𞺍' => 'ن',
+  '𞺎' => 'س',
+  '𞺏' => 'ع',
+  '𞺐' => 'ف',
+  '𞺑' => 'ص',
+  '𞺒' => 'ق',
+  '𞺓' => 'ر',
+  '𞺔' => 'ش',
+  '𞺕' => 'ت',
+  '𞺖' => 'ث',
+  '𞺗' => 'خ',
+  '𞺘' => 'ذ',
+  '𞺙' => 'ض',
+  '𞺚' => 'ظ',
+  '𞺛' => 'غ',
+  '𞺡' => 'ب',
+  '𞺢' => 'ج',
+  '𞺣' => 'د',
+  '𞺥' => 'و',
+  '𞺦' => 'ز',
+  '𞺧' => 'ح',
+  '𞺨' => 'ط',
+  '𞺩' => 'ي',
+  '𞺫' => 'ل',
+  '𞺬' => 'م',
+  '𞺭' => 'ن',
+  '𞺮' => 'س',
+  '𞺯' => 'ع',
+  '𞺰' => 'ف',
+  '𞺱' => 'ص',
+  '𞺲' => 'ق',
+  '𞺳' => 'ر',
+  '𞺴' => 'ش',
+  '𞺵' => 'ت',
+  '𞺶' => 'ث',
+  '𞺷' => 'خ',
+  '𞺸' => 'ذ',
+  '𞺹' => 'ض',
+  '𞺺' => 'ظ',
+  '𞺻' => 'غ',
+  '🄀' => '0.',
+  '🄁' => '0,',
+  '🄂' => '1,',
+  '🄃' => '2,',
+  '🄄' => '3,',
+  '🄅' => '4,',
+  '🄆' => '5,',
+  '🄇' => '6,',
+  '🄈' => '7,',
+  '🄉' => '8,',
+  '🄊' => '9,',
+  '🄐' => '(A)',
+  '🄑' => '(B)',
+  '🄒' => '(C)',
+  '🄓' => '(D)',
+  '🄔' => '(E)',
+  '🄕' => '(F)',
+  '🄖' => '(G)',
+  '🄗' => '(H)',
+  '🄘' => '(I)',
+  '🄙' => '(J)',
+  '🄚' => '(K)',
+  '🄛' => '(L)',
+  '🄜' => '(M)',
+  '🄝' => '(N)',
+  '🄞' => '(O)',
+  '🄟' => '(P)',
+  '🄠' => '(Q)',
+  '🄡' => '(R)',
+  '🄢' => '(S)',
+  '🄣' => '(T)',
+  '🄤' => '(U)',
+  '🄥' => '(V)',
+  '🄦' => '(W)',
+  '🄧' => '(X)',
+  '🄨' => '(Y)',
+  '🄩' => '(Z)',
+  '🄪' => '〔S〕',
+  '🄫' => 'C',
+  '🄬' => 'R',
+  '🄭' => 'CD',
+  '🄮' => 'WZ',
+  '🄰' => 'A',
+  '🄱' => 'B',
+  '🄲' => 'C',
+  '🄳' => 'D',
+  '🄴' => 'E',
+  '🄵' => 'F',
+  '🄶' => 'G',
+  '🄷' => 'H',
+  '🄸' => 'I',
+  '🄹' => 'J',
+  '🄺' => 'K',
+  '🄻' => 'L',
+  '🄼' => 'M',
+  '🄽' => 'N',
+  '🄾' => 'O',
+  '🄿' => 'P',
+  '🅀' => 'Q',
+  '🅁' => 'R',
+  '🅂' => 'S',
+  '🅃' => 'T',
+  '🅄' => 'U',
+  '🅅' => 'V',
+  '🅆' => 'W',
+  '🅇' => 'X',
+  '🅈' => 'Y',
+  '🅉' => 'Z',
+  '🅊' => 'HV',
+  '🅋' => 'MV',
+  '🅌' => 'SD',
+  '🅍' => 'SS',
+  '🅎' => 'PPV',
+  '🅏' => 'WC',
+  '🅪' => 'MC',
+  '🅫' => 'MD',
+  '🅬' => 'MR',
+  '🆐' => 'DJ',
+  '🈀' => 'ほか',
+  '🈁' => 'ココ',
+  '🈂' => 'サ',
+  '🈐' => '手',
+  '🈑' => '字',
+  '🈒' => '双',
+  '🈓' => 'デ',
+  '🈔' => '二',
+  '🈕' => '多',
+  '🈖' => '解',
+  '🈗' => '天',
+  '🈘' => '交',
+  '🈙' => '映',
+  '🈚' => '無',
+  '🈛' => '料',
+  '🈜' => '前',
+  '🈝' => '後',
+  '🈞' => '再',
+  '🈟' => '新',
+  '🈠' => '初',
+  '🈡' => '終',
+  '🈢' => '生',
+  '🈣' => '販',
+  '🈤' => '声',
+  '🈥' => '吹',
+  '🈦' => '演',
+  '🈧' => '投',
+  '🈨' => '捕',
+  '🈩' => '一',
+  '🈪' => '三',
+  '🈫' => '遊',
+  '🈬' => '左',
+  '🈭' => '中',
+  '🈮' => '右',
+  '🈯' => '指',
+  '🈰' => '走',
+  '🈱' => '打',
+  '🈲' => '禁',
+  '🈳' => '空',
+  '🈴' => '合',
+  '🈵' => '満',
+  '🈶' => '有',
+  '🈷' => '月',
+  '🈸' => '申',
+  '🈹' => '割',
+  '🈺' => '営',
+  '🈻' => '配',
+  '🉀' => '〔本〕',
+  '🉁' => '〔三〕',
+  '🉂' => '〔二〕',
+  '🉃' => '〔安〕',
+  '🉄' => '〔点〕',
+  '🉅' => '〔打〕',
+  '🉆' => '〔盗〕',
+  '🉇' => '〔勝〕',
+  '🉈' => '〔敗〕',
+  '🉐' => '得',
+  '🉑' => '可',
+  '🯰' => '0',
+  '🯱' => '1',
+  '🯲' => '2',
+  '🯳' => '3',
+  '🯴' => '4',
+  '🯵' => '5',
+  '🯶' => '6',
+  '🯷' => '7',
+  '🯸' => '8',
+  '🯹' => '9',
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/bootstrap.php b/lib/symfony/polyfill-intl-normalizer/bootstrap.php
new file mode 100644
index 000000000..bac4318c9
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/bootstrap.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Intl\Normalizer as p;
+
+if (!function_exists('normalizer_is_normalized')) {
+    function normalizer_is_normalized($input, $form = p\Normalizer::NFC) { return p\Normalizer::isNormalized($input, $form); }
+}
+if (!function_exists('normalizer_normalize')) {
+    function normalizer_normalize($input, $form = p\Normalizer::NFC) { return p\Normalizer::normalize($input, $form); }
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/composer.json b/lib/symfony/polyfill-intl-normalizer/composer.json
new file mode 100644
index 000000000..8df2fa1e6
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/composer.json
@@ -0,0 +1,39 @@
+{
+    "name": "symfony/polyfill-intl-normalizer",
+    "type": "library",
+    "description": "Symfony polyfill for intl's Normalizer class and related functions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "intl", "normalizer"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Intl\\Normalizer\\": "" },
+        "files": [ "bootstrap.php" ],
+        "classmap": [ "Resources/stubs" ]
+    },
+    "suggest": {
+        "ext-intl": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/lib/symfony/polyfill-php72/LICENSE b/lib/symfony/polyfill-php72/LICENSE
new file mode 100644
index 000000000..4cd8bdd30
--- /dev/null
+++ b/lib/symfony/polyfill-php72/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+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
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-php72/Php72.php b/lib/symfony/polyfill-php72/Php72.php
new file mode 100644
index 000000000..1e36d5e62
--- /dev/null
+++ b/lib/symfony/polyfill-php72/Php72.php
@@ -0,0 +1,217 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php72;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * @internal
+ */
+final class Php72
+{
+    private static $hashMask;
+
+    public static function utf8_encode($s)
+    {
+        $s .= $s;
+        $len = \strlen($s);
+
+        for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
+            switch (true) {
+                case $s[$i] < "\x80": $s[$j] = $s[$i]; break;
+                case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break;
+                default: $s[$j] = "\xC3"; $s[++$j] = \chr(\ord($s[$i]) - 64); break;
+            }
+        }
+
+        return substr($s, 0, $j);
+    }
+
+    public static function utf8_decode($s)
+    {
+        $s = (string) $s;
+        $len = \strlen($s);
+
+        for ($i = 0, $j = 0; $i < $len; ++$i, ++$j) {
+            switch ($s[$i] & "\xF0") {
+                case "\xC0":
+                case "\xD0":
+                    $c = (\ord($s[$i] & "\x1F") << 6) | \ord($s[++$i] & "\x3F");
+                    $s[$j] = $c < 256 ? \chr($c) : '?';
+                    break;
+
+                case "\xF0":
+                    ++$i;
+                    // no break
+
+                case "\xE0":
+                    $s[$j] = '?';
+                    $i += 2;
+                    break;
+
+                default:
+                    $s[$j] = $s[$i];
+            }
+        }
+
+        return substr($s, 0, $j);
+    }
+
+    public static function php_os_family()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            return 'Windows';
+        }
+
+        $map = array(
+            'Darwin' => 'Darwin',
+            'DragonFly' => 'BSD',
+            'FreeBSD' => 'BSD',
+            'NetBSD' => 'BSD',
+            'OpenBSD' => 'BSD',
+            'Linux' => 'Linux',
+            'SunOS' => 'Solaris',
+        );
+
+        return isset($map[PHP_OS]) ? $map[PHP_OS] : 'Unknown';
+    }
+
+    public static function spl_object_id($object)
+    {
+        if (null === self::$hashMask) {
+            self::initHashMask();
+        }
+        if (null === $hash = spl_object_hash($object)) {
+            return;
+        }
+
+        // On 32-bit systems, PHP_INT_SIZE is 4,
+        return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+    }
+
+    public static function sapi_windows_vt100_support($stream, $enable = null)
+    {
+        if (!\is_resource($stream)) {
+            trigger_error('sapi_windows_vt100_support() expects parameter 1 to be resource, '.\gettype($stream).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        $meta = stream_get_meta_data($stream);
+
+        if ('STDIO' !== $meta['stream_type']) {
+            trigger_error('sapi_windows_vt100_support() was not able to analyze the specified stream', E_USER_WARNING);
+
+            return false;
+        }
+
+        // We cannot actually disable vt100 support if it is set
+        if (false === $enable || !self::stream_isatty($stream)) {
+            return false;
+        }
+
+        // The native function does not apply to stdin
+        $meta = array_map('strtolower', $meta);
+        $stdin = 'php://stdin' === $meta['uri'] || 'php://fd/0' === $meta['uri'];
+
+        return !$stdin
+            && (false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
+            || 'xterm' === getenv('TERM')
+            || 'Hyper' === getenv('TERM_PROGRAM'));
+    }
+
+    public static function stream_isatty($stream)
+    {
+        if (!\is_resource($stream)) {
+            trigger_error('stream_isatty() expects parameter 1 to be resource, '.\gettype($stream).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $stat = @fstat($stream);
+            // Check if formatted mode is S_IFCHR
+            return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+        }
+
+        return \function_exists('posix_isatty') && @posix_isatty($stream);
+    }
+
+    private static function initHashMask()
+    {
+        $obj = (object) array();
+        self::$hashMask = -1;
+
+        // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
+        $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
+        foreach (debug_backtrace(\PHP_VERSION_ID >= 50400 ? DEBUG_BACKTRACE_IGNORE_ARGS : false) as $frame) {
+            if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && \in_array($frame['function'], $obFuncs)) {
+                $frame['line'] = 0;
+                break;
+            }
+        }
+        if (!empty($frame['line'])) {
+            ob_start();
+            debug_zval_dump($obj);
+            self::$hashMask = (int) substr(ob_get_clean(), 17);
+        }
+
+        self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+    }
+
+    public static function mb_chr($code, $encoding = null)
+    {
+        if (0x80 > $code %= 0x200000) {
+            $s = \chr($code);
+        } elseif (0x800 > $code) {
+            $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F);
+        } elseif (0x10000 > $code) {
+            $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+        } else {
+            $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+        }
+
+        if ('UTF-8' !== $encoding) {
+            $s = mb_convert_encoding($s, $encoding, 'UTF-8');
+        }
+
+        return $s;
+    }
+
+    public static function mb_ord($s, $encoding = null)
+    {
+        if (null === $encoding) {
+            $s = mb_convert_encoding($s, 'UTF-8');
+        } elseif ('UTF-8' !== $encoding) {
+            $s = mb_convert_encoding($s, 'UTF-8', $encoding);
+        }
+
+        if (1 === \strlen($s)) {
+            return \ord($s);
+        }
+
+        $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0;
+        if (0xF0 <= $code) {
+            return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80;
+        }
+        if (0xE0 <= $code) {
+            return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80;
+        }
+        if (0xC0 <= $code) {
+            return (($code - 0xC0) << 6) + $s[2] - 0x80;
+        }
+
+        return $code;
+    }
+}
diff --git a/lib/symfony/polyfill-php72/README.md b/lib/symfony/polyfill-php72/README.md
new file mode 100644
index 000000000..59dec8a23
--- /dev/null
+++ b/lib/symfony/polyfill-php72/README.md
@@ -0,0 +1,28 @@
+Symfony Polyfill / Php72
+========================
+
+This component provides functions added to PHP 7.2 core:
+
+- [`spl_object_id`](https://php.net/spl_object_id)
+- [`stream_isatty`](https://php.net/stream_isatty)
+
+On Windows only:
+
+- [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support)
+
+Moved to core since 7.2 (was in the optional XML extension earlier):
+
+- [`utf8_encode`](https://php.net/utf8_encode)
+- [`utf8_decode`](https://php.net/utf8_decode)
+
+Also, it provides constants added to PHP 7.2:
+- [`PHP_FLOAT_*`](https://php.net/reserved.constants#constant.php-float-dig)
+- [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family)
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-php72/bootstrap.php b/lib/symfony/polyfill-php72/bootstrap.php
new file mode 100644
index 000000000..3154b2c32
--- /dev/null
+++ b/lib/symfony/polyfill-php72/bootstrap.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php72 as p;
+
+if (PHP_VERSION_ID >= 70200) {
+    return;
+}
+
+if (!defined('PHP_FLOAT_DIG')) {
+    define('PHP_FLOAT_DIG', 15);
+}
+if (!defined('PHP_FLOAT_EPSILON')) {
+    define('PHP_FLOAT_EPSILON', 2.2204460492503E-16);
+}
+if (!defined('PHP_FLOAT_MIN')) {
+    define('PHP_FLOAT_MIN', 2.2250738585072E-308);
+}
+if (!defined('PHP_FLOAT_MAX')) {
+    define('PHP_FLOAT_MAX', 1.7976931348623157E+308);
+}
+if (!defined('PHP_OS_FAMILY')) {
+    define('PHP_OS_FAMILY', p\Php72::php_os_family());
+}
+
+if ('\\' === DIRECTORY_SEPARATOR && !function_exists('sapi_windows_vt100_support')) {
+    function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::sapi_windows_vt100_support($stream, $enable); }
+}
+if (!function_exists('stream_isatty')) {
+    function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
+}
+if (!function_exists('utf8_encode')) {
+    function utf8_encode($string) { return p\Php72::utf8_encode($string); }
+}
+if (!function_exists('utf8_decode')) {
+    function utf8_decode($string) { return p\Php72::utf8_decode($string); }
+}
+if (!function_exists('spl_object_id')) {
+    function spl_object_id($object) { return p\Php72::spl_object_id($object); }
+}
+if (!function_exists('mb_ord')) {
+    function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); }
+}
+if (!function_exists('mb_scrub')) {
+    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
+}
diff --git a/lib/symfony/polyfill-php72/composer.json b/lib/symfony/polyfill-php72/composer.json
new file mode 100644
index 000000000..872b312c1
--- /dev/null
+++ b/lib/symfony/polyfill-php72/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "symfony/polyfill-php72",
+    "type": "library",
+    "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Php72\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}