2 files changed, 532 insertions, 432 deletions

diff --git a/_test/tests/inc/utf8_strtolower.test.php b/_test/tests/inc/utf8_strtolower.test.php
index 2654c72cc..d03996ffd 100644
--- a/_test/tests/inc/utf8_strtolower.test.php
+++ b/_test/tests/inc/utf8_strtolower.test.php
@@ -1,23 +1,31 @@
 <?php
-// use no mbstring help here
-if(!defined('UTF8_NOMBSTRING')) define('UTF8_NOMBSTRING',1);
 
-class utf8_strtolower_test extends DokuWikiTest {
+class utf8_strtolower_test extends DokuWikiTest
+{
 
-    function test_givens(){
-        $data = array(
-            'Αρχιτεκτονική Μελέτη' => 'αρχιτεκτονική μελέτη', // FS#2173
-        );
-
-        foreach($data as $input => $expected) {
-            $this->assertEquals($expected, \dokuwiki\Utf8\PhpString::strtolower($input));
-        }
+    /**
+     * @see testGivens
+     * @return array
+     */
+    public function provideGivens()
+    {
+        return [
+            ['Αρχιτεκτονική Μελέτη', 'αρχιτεκτονική μελέτη'], // FS#2173
+            ['ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'],
+            ['players:Bruce', 'players:bruce'],
+            ['players:GERALD', 'players:gerald'],
+        ];
+    }
 
+    /**
+     * @dataProvider provideGivens
+     * @param string $input
+     * @param string $expected
+     */
+    public function testGivens($input, $expected)
+    {
+        $this->assertEquals($expected, \dokuwiki\Utf8\PhpString::strtolower($input));
         // just make sure our data was correct
-        if(function_exists('mb_strtolower')) {
-            foreach($data as $input => $expected) {
-                $this->assertEquals($expected, mb_strtolower($input, 'utf-8'));
-            }
-        }
+        $this->assertEquals($expected, mb_strtolower($input, 'utf-8'), 'mbstring check');
     }
 }
diff --git a/inc/Utf8/tables/case.php b/inc/Utf8/tables/case.php
index ac5f5629e..f556ccb4d 100644
--- a/inc/Utf8/tables/case.php
+++ b/inc/Utf8/tables/case.php
@@ -9,559 +9,651 @@
  */
 return [
     'A' => 'a',
-    'Ａ' => 'ａ',
-    'Á' => 'á',
+    'B' => 'b',
+    'C' => 'c',
+    'D' => 'd',
+    'E' => 'e',
+    'F' => 'f',
+    'G' => 'g',
+    'H' => 'h',
+    'I' => 'i',
+    'J' => 'j',
+    'K' => 'k',
+    'L' => 'l',
+    'M' => 'm',
+    'N' => 'n',
+    'O' => 'o',
+    'P' => 'p',
+    'Q' => 'q',
+    'R' => 'r',
+    'S' => 's',
+    'T' => 't',
+    'U' => 'u',
+    'V' => 'v',
+    'W' => 'w',
+    'X' => 'x',
+    'Y' => 'y',
+    'Z' => 'z',
     'À' => 'à',
-    'Ă' => 'ă',
-    'Ắ' => 'ắ',
-    'Ẵ' => 'ẵ',
-    'Ẳ' => 'ẳ',
+    'Á' => 'á',
     'Â' => 'â',
-    'Ấ' => 'ấ',
-    'Ầ' => 'ầ',
-    'Ẫ' => 'ẫ',
-    'Ǎ' => 'ǎ',
-    'Å' => 'å',
-    'Ǻ' => 'ǻ',
-    'Ä' => 'ä',
-    'Ǟ' => 'ǟ',
     'Ã' => 'ã',
-    'Ǡ' => 'ǡ',
-    'Ą' => 'ą',
-    'Ā' => 'ā',
-    'Ả' => 'ả',
-    'Ȁ' => 'ȁ',
-    'Ȃ' => 'ȃ',
-    'Ặ' => 'ặ',
-    'Ậ' => 'ậ',
-    'Ḁ' => 'ḁ',
+    'Ä' => 'ä',
+    'Å' => 'å',
     'Æ' => 'æ',
-    'Ǽ' => 'ǽ',
-    'Ǣ' => 'ǣ',
-    'Ｂ' => 'ｂ',
-    'Ḃ' => 'ḃ',
-    'Ḅ' => 'ḅ',
-    'Ḇ' => 'ḇ',
-    'Ɓ' => 'ɓ',
-    'Ƃ' => 'ƃ',
-    'Ｃ' => 'ｃ',
+    'Ç' => 'ç',
+    'È' => 'è',
+    'É' => 'é',
+    'Ê' => 'ê',
+    'Ë' => 'ë',
+    'Ì' => 'ì',
+    'Í' => 'í',
+    'Î' => 'î',
+    'Ï' => 'ï',
+    'Ð' => 'ð',
+    'Ñ' => 'ñ',
+    'Ò' => 'ò',
+    'Ó' => 'ó',
+    'Ô' => 'ô',
+    'Õ' => 'õ',
+    'Ö' => 'ö',
+    'Ø' => 'ø',
+    'Ù' => 'ù',
+    'Ú' => 'ú',
+    'Û' => 'û',
+    'Ü' => 'ü',
+    'Ý' => 'ý',
+    'Þ' => 'þ',
+    'Ā' => 'ā',
+    'Ă' => 'ă',
+    'Ą' => 'ą',
     'Ć' => 'ć',
     'Ĉ' => 'ĉ',
-    'Č' => 'č',
     'Ċ' => 'ċ',
-    'Ç' => 'ç',
-    'Ƈ' => 'ƈ',
-    'D' => 'd',
-    'Ｄ' => 'ｄ',
+    'Č' => 'č',
     'Ď' => 'ď',
-    'Ḋ' => 'ḋ',
-    'Ḑ' => 'ḑ',
-    'Ḍ' => 'ḍ',
-    'Ḓ' => 'ḓ',
-    'Ḏ' => 'ḏ',
-    'Ð' => 'ð',
-    'Dz' => 'dz', //FIXME
-    'Dž' => 'dž', //FIXME
-    'Ɗ' => 'ɗ',
-    'Ƌ' => 'ƌ',
-    'E' => 'e',
-    'Ｅ' => 'ｅ',
-    'É' => 'é',
-    'È' => 'è',
-    'Ê' => 'ê',
-    'Ế' => 'ế',
-    'Ề' => 'ề',
-    'Ễ' => 'ễ',
-    'Ể' => 'ể',
-    'Ě' => 'ě',
-    'Ẽ' => 'ẽ',
+    'Đ' => 'đ',
+    'Ē' => 'ē',
+    'Ĕ' => 'ĕ',
     'Ė' => 'ė',
-    'Ȩ' => 'ȩ',
-    'Ḝ' => 'ḝ',
     'Ę' => 'ę',
-    'Ē' => 'ē',
-    'Ḕ' => 'ḕ',
-    'Ẻ' => 'ẻ',
-    'Ȅ' => 'ȅ',
-    'Ȇ' => 'ȇ',
-    'Ẹ' => 'ẹ',
-    'Ệ' => 'ệ',
-    'Ḛ' => 'ḛ',
-    'Ǝ' => 'ǝ',
-    'Ə' => 'ə',
-    'Ɛ' => 'ɛ',
-    'F' => 'f',
-    'Ｆ' => 'ｆ',
-    'Ƒ' => 'ƒ',
-    'G' => 'g',
-    'Ｇ' => 'ｇ',
-    'Ǵ' => 'ǵ',
-    'Ğ' => 'ğ',
+    'Ě' => 'ě',
     'Ĝ' => 'ĝ',
+    'Ğ' => 'ğ',
     'Ġ' => 'ġ',
     'Ģ' => 'ģ',
-    'Ḡ' => 'ḡ',
-    'Ǥ' => 'ǥ',
-    'Ɣ' => 'ɣ',
-    'Ƣ' => 'ƣ',
-    'Ｈ' => 'ｈ',
     'Ĥ' => 'ĥ',
-    'Ȟ' => 'ȟ',
-    'Ḧ' => 'ḧ',
-    'Ḣ' => 'ḣ',
-    'Ḩ' => 'ḩ',
-    'Ḥ' => 'ḥ',
-    'Ḫ' => 'ḫ',
-    'Ƕ' => 'ƕ',
-    'I' => 'i',
-    'Ｉ' => 'ｉ',
-    'Í' => 'í',
-    'Ĭ' => 'ĭ',
-    'Î' => 'î',
-    'Ǐ' => 'ǐ',
-    'Ï' => 'ï',
-    'Ḯ' => 'ḯ',
+    'Ħ' => 'ħ',
     'Ĩ' => 'ĩ',
     'Ī' => 'ī',
-    'Ỉ' => 'ỉ',
-    'Ȉ' => 'ȉ',
-    'Ȋ' => 'ȋ',
-    'Ị' => 'ị',
-    'Ḭ' => 'ḭ',
-    'Ɨ' => 'ɨ',
-    'Ɩ' => 'ɩ',
-    'J' => 'j',
-    'Ｊ' => 'ｊ',
+    'Ĭ' => 'ĭ',
+    'Į' => 'į',
+    'IJ' => 'ij',
     'Ĵ' => 'ĵ',
-    'K' => 'k',
-    'Ḱ' => 'ḱ',
-    'Ǩ' => 'ǩ',
     'Ķ' => 'ķ',
-    'Ḳ' => 'ḳ',
-    'Ḵ' => 'ḵ',
-    'Ƙ' => 'ƙ',
-    'Ｌ' => 'ｌ',
     'Ĺ' => 'ĺ',
-    'Ľ' => 'ľ',
     'Ļ' => 'ļ',
-    'Ł' => 'ł',
-    'Ḷ' => 'ḷ',
-    'Ḽ' => 'ḽ',
-    'Ḻ' => 'ḻ',
+    'Ľ' => 'ľ',
     'Ŀ' => 'ŀ',
-    'Lj' => 'lj', // FIXME
-    'M' => 'm',
-    'Ｍ' => 'ｍ',
-    'Ṁ' => 'ṁ',
-    'Ṃ' => 'ṃ',
-    'N' => 'n',
-    'Ｎ' => 'ｎ',
+    'Ł' => 'ł',
     'Ń' => 'ń',
-    'Ǹ' => 'ǹ',
-    'Ñ' => 'ñ',
-    'Ṅ' => 'ṅ',
     'Ņ' => 'ņ',
-    'Ṇ' => 'ṇ',
-    'Ṋ' => 'ṋ',
-    'Ṉ' => 'ṉ',
-    'Ɲ' => 'ɲ',
-    'Ƞ' => 'ƞ',
+    'Ň' => 'ň',
     'Ŋ' => 'ŋ',
-    'O' => 'o',
-    'Ｏ' => 'ｏ',
-    'Ó' => 'ó',
+    'Ō' => 'ō',
     'Ŏ' => 'ŏ',
-    'Ô' => 'ô',
-    'Ố' => 'ố',
-    'Ồ' => 'ồ',
-    'Ỗ' => 'ỗ',
-    'Ổ' => 'ổ',
-    'Ö' => 'ö',
-    'Ȫ' => 'ȫ',
     'Ő' => 'ő',
-    'Õ' => 'õ',
-    'Ṍ' => 'ṍ',
-    'Ṏ' => 'ṏ',
-    'Ȯ' => 'ȯ',
-    'Ȱ' => 'ȱ',
-    'Ø' => 'ø',
-    'Ǿ' => 'ǿ',
-    'Ǫ' => 'ǫ',
-    'Ǭ' => 'ǭ',
-    'Ṓ' => 'ṓ',
-    'Ṑ' => 'ṑ',
-    'Ỏ' => 'ỏ',
-    'Ȍ' => 'ȍ',
-    'Ȏ' => 'ȏ',
-    'Ơ' => 'ơ',
-    'Ờ' => 'ờ',
-    'Ỡ' => 'ỡ',
-    'Ở' => 'ở',
-    'Ợ' => 'ợ',
-    'Ọ' => 'ọ',
-    'Ộ' => 'ộ',
-    'Ɔ' => 'ɔ',
-    'Ɵ' => 'ɵ',
-    'Ȣ' => 'ȣ',
-    'P' => 'p',
-    'Ｐ' => 'ｐ',
-    'Ṕ' => 'ṕ',
-    'Ƥ' => 'ƥ',
-    'Q' => 'q',
-    'Ｑ' => 'ｑ',
-    'R' => 'r',
-    'Ｒ' => 'ｒ',
+    'Œ' => 'œ',
     'Ŕ' => 'ŕ',
-    'Ṙ' => 'ṙ',
     'Ŗ' => 'ŗ',
-    'Ȑ' => 'ȑ',
-    'Ȓ' => 'ȓ',
-    'Ṛ' => 'ṛ',
-    'Ṝ' => 'ṝ',
-    'Ʀ' => 'ʀ',
-    'S' => 's',
-    'Ｓ' => 'ｓ',
+    'Ř' => 'ř',
     'Ś' => 'ś',
-    'Ṥ' => 'ṥ',
     'Ŝ' => 'ŝ',
-    'Ṧ' => 'ṧ',
-    'Ṡ' => 'ṡ',
     'Ş' => 'ş',
-    'Ṣ' => 'ṣ',
-    'Ṩ' => 'ṩ',
-    'Ș' => 'ș',
-    'T' => 't',
-    'Ｔ' => 'ｔ',
-    'Ť' => 'ť',
-    'Ṫ' => 'ṫ',
+    'Š' => 'š',
     'Ţ' => 'ţ',
-    'Ṭ' => 'ṭ',
-    'Ṱ' => 'ṱ',
-    'Ṯ' => 'ṯ',
+    'Ť' => 'ť',
     'Ŧ' => 'ŧ',
-    'Ƭ' => 'ƭ',
-    'Ʈ' => 'ʈ',
-    'U' => 'u',
-    'Ú' => 'ú',
-    'Ù' => 'ù',
+    'Ũ' => 'ũ',
+    'Ū' => 'ū',
     'Ŭ' => 'ŭ',
-    'Û' => 'û',
-    'Ǔ' => 'ǔ',
     'Ů' => 'ů',
-    'Ǘ' => 'ǘ',
-    'Ǜ' => 'ǜ',
-    'Ǚ' => 'ǚ',
-    'Ǖ' => 'ǖ',
     'Ű' => 'ű',
-    'Ũ' => 'ũ',
     'Ų' => 'ų',
-    'Ū' => 'ū',
-    'Ṻ' => 'ṻ',
-    'Ủ' => 'ủ',
-    'Ȕ' => 'ȕ',
-    'Ȗ' => 'ȗ',
-    'Ứ' => 'ứ',
-    'Ừ' => 'ừ',
-    'Ữ' => 'ữ',
-    'Ử' => 'ử',
-    'Ự' => 'ự',
-    'Ụ' => 'ụ',
-    'Ṷ' => 'ṷ',
-    'Ṵ' => 'ṵ',
-    'Ɯ' => 'ɯ',
-    'Ʊ' => 'ʊ',
-    'V' => 'v',
-    'Ｖ' => 'ｖ',
-    'Ṿ' => 'ṿ',
-    'Ʋ' => 'ʋ',
-    'W' => 'w',
-    'Ｗ' => 'ｗ',
-    'Ẃ' => 'ẃ',
-    'Ẁ' => 'ẁ',
-    'Ẅ' => 'ẅ',
-    'Ẇ' => 'ẇ',
-    'Ẉ' => 'ẉ',
-    'X' => 'x',
-    'Ｘ' => 'ｘ',
-    'Ẍ' => 'ẍ',
-    'Y' => 'y',
-    'Ｙ' => 'ｙ',
-    'Ý' => 'ý',
-    'Ỳ' => 'ỳ',
+    'Ŵ' => 'ŵ',
     'Ŷ' => 'ŷ',
     'Ÿ' => 'ÿ',
-    'Ẏ' => 'ẏ',
-    'Ȳ' => 'ȳ',
-    'Ỷ' => 'ỷ',
-    'Ỵ' => 'ỵ',
-    'Ƴ' => 'ƴ',
-    'Ȝ' => 'ȝ',
-    'Ｚ' => 'ｚ',
     'Ź' => 'ź',
-    'Ẑ' => 'ẑ',
-    'Ž' => 'ž',
     'Ż' => 'ż',
-    'Ẓ' => 'ẓ',
+    'Ž' => 'ž',
+    'Ɓ' => 'ɓ',
+    'Ƃ' => 'ƃ',
+    'Ƅ' => 'ƅ',
+    'Ɔ' => 'ɔ',
+    'Ƈ' => 'ƈ',
+    'Ɖ' => 'ɖ',
+    'Ɗ' => 'ɗ',
+    'Ƌ' => 'ƌ',
+    'Ǝ' => 'ǝ',
+    'Ə' => 'ə',
+    'Ɛ' => 'ɛ',
+    'Ƒ' => 'ƒ',
+    'Ɣ' => 'ɣ',
+    'Ɩ' => 'ɩ',
+    'Ɨ' => 'ɨ',
+    'Ƙ' => 'ƙ',
+    'Ɯ' => 'ɯ',
+    'Ɲ' => 'ɲ',
+    'Ɵ' => 'ɵ',
+    'Ơ' => 'ơ',
+    'Ƣ' => 'ƣ',
+    'Ƥ' => 'ƥ',
+    'Ʀ' => 'ʀ',
+    'Ƨ' => 'ƨ',
+    'Ʃ' => 'ʃ',
+    'Ƭ' => 'ƭ',
+    'Ʈ' => 'ʈ',
+    'Ư' => 'ư',
+    'Ʊ' => 'ʊ',
+    'Ʋ' => 'ʋ',
+    'Ƴ' => 'ƴ',
     'Ƶ' => 'ƶ',
-    'Ȥ' => 'ȥ',
     'Ʒ' => 'ʒ',
-    'Ǯ' => 'ǯ',
     'Ƹ' => 'ƹ',
-    'Þ' => 'þ',
-    'Ƨ' => 'ƨ',
     'Ƽ' => 'ƽ',
-    'Ƅ' => 'ƅ',
+    'Dž' => 'dž',
+    'Lj' => 'lj',
+    'Nj' => 'nj',
+    'Ǎ' => 'ǎ',
+    'Ǐ' => 'ǐ',
+    'Ǒ' => 'ǒ',
+    'Ǔ' => 'ǔ',
+    'Ǖ' => 'ǖ',
+    'Ǘ' => 'ǘ',
+    'Ǚ' => 'ǚ',
+    'Ǜ' => 'ǜ',
+    'Ǟ' => 'ǟ',
+    'Ǡ' => 'ǡ',
+    'Ǣ' => 'ǣ',
+    'Ǥ' => 'ǥ',
+    'Ǧ' => 'ǧ',
+    'Ǩ' => 'ǩ',
+    'Ǫ' => 'ǫ',
+    'Ǭ' => 'ǭ',
+    'Ǯ' => 'ǯ',
+    'Dz' => 'dz',
+    'Ǵ' => 'ǵ',
+    'Ƕ' => 'ƕ',
+    'Ƿ' => 'ƿ',
+    'Ǹ' => 'ǹ',
+    'Ǻ' => 'ǻ',
+    'Ǽ' => 'ǽ',
+    'Ǿ' => 'ǿ',
+    'Ȁ' => 'ȁ',
+    'Ȃ' => 'ȃ',
+    'Ȅ' => 'ȅ',
+    'Ȇ' => 'ȇ',
+    'Ȉ' => 'ȉ',
+    'Ȋ' => 'ȋ',
+    'Ȍ' => 'ȍ',
+    'Ȏ' => 'ȏ',
+    'Ȑ' => 'ȑ',
+    'Ȓ' => 'ȓ',
+    'Ȕ' => 'ȕ',
+    'Ȗ' => 'ȗ',
+    'Ș' => 'ș',
+    'Ț' => 'ț',
+    'Ȝ' => 'ȝ',
+    'Ȟ' => 'ȟ',
+    'Ƞ' => 'ƞ',
+    'Ȣ' => 'ȣ',
+    'Ȥ' => 'ȥ',
+    'Ȧ' => 'ȧ',
+    'Ȩ' => 'ȩ',
+    'Ȫ' => 'ȫ',
+    'Ȭ' => 'ȭ',
+    'Ȯ' => 'ȯ',
+    'Ȱ' => 'ȱ',
+    'Ȳ' => 'ȳ',
+    'Ά' => 'ά',
+    'Έ' => 'έ',
+    'Ή' => 'ή',
+    'Ί' => 'ί',
+    'Ό' => 'ό',
+    'Ύ' => 'ύ',
+    'Ώ' => 'ώ',
     'Α' => 'α',
-    'Ἀ' => 'ἀ',
-    'Ἄ' => 'ἄ',
-    'Ἂ' => 'ἂ',
-    'ᾊ' => 'ᾂ',
-    'Ἆ' => 'ἆ',
-    'ᾎ' => 'ᾆ',
-    'ᾈ' => 'ᾀ',
-    'Ἁ' => 'ἁ',
-    'ᾍ' => 'ᾅ',
-    'Ἃ' => 'ἃ',
-    'ᾋ' => 'ᾃ',
-    'Ἇ' => 'ἇ',
-    'ᾏ' => 'ᾇ',
-    'ᾉ' => 'ᾁ',
-    'Ὰ' => 'ὰ',
-    'Ᾰ' => 'ᾰ',
-    'Ᾱ' => 'ᾱ',
-    'ᾼ' => 'ᾳ',
     'Β' => 'β',
     'Γ' => 'γ',
+    'Δ' => 'δ',
     'Ε' => 'ε',
-    'Ἐ' => 'ἐ',
-    'Ἔ' => 'ἔ',
-    'Ἒ' => 'ἒ',
-    'Ἑ' => 'ἑ',
-    'Ἕ' => 'ἕ',
-    'Έ' => 'έ',
-    'Ὲ' => 'ὲ',
-    'Ϝ' => 'ϝ',
-    'Ϛ' => 'ϛ',
     'Ζ' => 'ζ',
     'Η' => 'η',
-    'ᾜ' => 'ᾔ',
-    'Ἢ' => 'ἢ',
-    'ᾚ' => 'ᾒ',
-    'Ἦ' => 'ἦ',
-    'ᾞ' => 'ᾖ',
-    'ᾘ' => 'ᾐ',
-    'Ἥ' => 'ἥ',
-    'ᾝ' => 'ᾕ',
-    'Ἣ' => 'ἣ',
-    'ᾛ' => 'ᾓ',
-    'Ἧ' => 'ἧ',
-    'ᾟ' => 'ᾗ',
-    'Ή' => 'ή',
-    'Ὴ' => 'ὴ',
-    'ῌ' => 'ῃ',
     'Θ' => 'θ',
     'Ι' => 'ι',
-    'Ἰ' => 'ἰ',
-    'Ἲ' => 'ἲ',
-    'Ἶ' => 'ἶ',
-    'Ἱ' => 'ἱ',
-    'Ἵ' => 'ἵ',
-    'Ἳ' => 'ἳ',
-    'Ἷ' => 'ἷ',
-    'Ὶ' => 'ὶ',
-    'Ῐ' => 'ῐ',
-    'Ϊ' => 'ϊ',
-    'Ῑ' => 'ῑ',
     'Κ' => 'κ',
     'Λ' => 'λ',
+    'Μ' => 'μ',
     'Ν' => 'ν',
     'Ξ' => 'ξ',
     'Ο' => 'ο',
-    'Ὀ' => 'ὀ',
-    'Ὄ' => 'ὄ',
-    'Ὂ' => 'ὂ',
-    'Ὅ' => 'ὅ',
-    'Ὃ' => 'ὃ',
-    'Ό' => 'ό',
-    'Ὸ' => 'ὸ',
     'Π' => 'π',
-    'Ϟ' => 'ϟ',
     'Ρ' => 'ρ',
-    'Ῥ' => 'ῥ',
     'Σ' => 'ς',
     'Τ' => 'τ',
     'Υ' => 'υ',
-    'Ὑ' => 'ὑ',
-    'Ὓ' => 'ὓ',
-    'Ὗ' => 'ὗ',
-    'Ύ' => 'ύ',
-    'Ὺ' => 'ὺ',
-    'Ϋ' => 'ϋ',
-    'Ῡ' => 'ῡ',
+    'Φ' => 'φ',
     'Χ' => 'χ',
     'Ψ' => 'ψ',
     'Ω' => 'ω',
-    'Ὤ' => 'ὤ',
-    'ᾬ' => 'ᾤ',
-    'Ὢ' => 'ὢ',
-    'Ὦ' => 'ὦ',
-    'ᾮ' => 'ᾦ',
-    'Ὡ' => 'ὡ',
-    'Ὥ' => 'ὥ',
-    'ᾭ' => 'ᾥ',
-    'Ὣ' => 'ὣ',
-    'Ὧ' => 'ὧ',
-    'ᾯ' => 'ᾧ',
-    'ᾩ' => 'ᾡ',
-    'Ώ' => 'ώ',
-    'Ὼ' => 'ὼ',
-    'ῼ' => 'ῳ',
+    'Ϊ' => 'ϊ',
+    'Ϋ' => 'ϋ',
+    'Ϙ' => 'ϙ',
+    'Ϛ' => 'ϛ',
+    'Ϝ' => 'ϝ',
+    'Ϟ' => 'ϟ',
+    'Ϡ' => 'ϡ',
     'Ϣ' => 'ϣ',
     'Ϥ' => 'ϥ',
     'Ϧ' => 'ϧ',
     'Ϩ' => 'ϩ',
     'Ϫ' => 'ϫ',
     'Ϭ' => 'ϭ',
-    'А' => 'а',
-    'Ӑ' => 'ӑ',
-    'Ӓ' => 'ӓ',
-    'Ә' => 'ә',
-    'Ӛ' => 'ӛ',
-    'Ӕ' => 'ӕ',
-    'В' => 'в',
-    'Г' => 'г',
-    'Ѓ' => 'ѓ',
-    'Ґ' => 'ґ',
-    'Ғ' => 'ғ',
-    'Ҕ' => 'ҕ',
-    'Ԁ' => 'ԁ',
-    'Ђ' => 'ђ',
-    'Ԃ' => 'ԃ',
-    'Ҙ' => 'ҙ',
-    'Е' => 'е',
+    'Ϯ' => 'ϯ',
     'Ѐ' => 'ѐ',
     'Ё' => 'ё',
+    'Ђ' => 'ђ',
+    'Ѓ' => 'ѓ',
     'Є' => 'є',
-    'Ж' => 'ж',
-    'Ӂ' => 'ӂ',
-    'Ӝ' => 'ӝ',
-    'Җ' => 'җ',
-    'Ӟ' => 'ӟ',
-    'Ԅ' => 'ԅ',
     'Ѕ' => 'ѕ',
-    'Ӡ' => 'ӡ',
-    'Ԇ' => 'ԇ',
-    'И' => 'и',
-    'Ӥ' => 'ӥ',
-    'Ӣ' => 'ӣ',
-    'Ҋ' => 'ҋ',
     'І' => 'і',
     'Ї' => 'ї',
+    'Ј' => 'ј',
+    'Љ' => 'љ',
+    'Њ' => 'њ',
+    'Ћ' => 'ћ',
+    'Ќ' => 'ќ',
+    'Ѝ' => 'ѝ',
+    'Ў' => 'ў',
+    'Џ' => 'џ',
+    'А' => 'а',
+    'Б' => 'б',
+    'В' => 'в',
+    'Г' => 'г',
+    'Д' => 'д',
+    'Е' => 'е',
+    'Ж' => 'ж',
+    'З' => 'з',
+    'И' => 'и',
     'Й' => 'й',
     'К' => 'к',
-    'Ќ' => 'ќ',
-    'Қ' => 'қ',
-    'Ӄ' => 'ӄ',
-    'Ҡ' => 'ҡ',
-    'Ҟ' => 'ҟ',
     'Л' => 'л',
-    'Ӆ' => 'ӆ',
-    'Љ' => 'љ',
-    'Ԉ' => 'ԉ',
     'М' => 'м',
-    'Ӎ' => 'ӎ',
-    'Ӊ' => 'ӊ',
-    'Ң' => 'ң',
-    'Ӈ' => 'ӈ',
-    'Ҥ' => 'ҥ',
-    'Њ' => 'њ',
-    'Ԋ' => 'ԋ',
-    'Ӧ' => 'ӧ',
-    'Ө' => 'ө',
-    'Ӫ' => 'ӫ',
+    'Н' => 'н',
+    'О' => 'о',
     'П' => 'п',
-    'Ҧ' => 'ҧ',
-    'Ҁ' => 'ҁ',
-    'Ҏ' => 'ҏ',
+    'Р' => 'р',
     'С' => 'с',
-    'Ԍ' => 'ԍ',
-    'Ҫ' => 'ҫ',
     'Т' => 'т',
-    'Ԏ' => 'ԏ',
-    'Ћ' => 'ћ',
     'У' => 'у',
-    'Ў' => 'ў',
-    'Ӱ' => 'ӱ',
-    'Ӳ' => 'ӳ',
-    'Ӯ' => 'ӯ',
-    'Ұ' => 'ұ',
-    'Ѹ' => 'ѹ',
     'Ф' => 'ф',
     'Х' => 'х',
-    'Ҳ' => 'ҳ',
-    'Һ' => 'һ',
-    'Ѿ' => 'ѿ',
-    'Ѽ' => 'ѽ',
-    'Ѻ' => 'ѻ',
     'Ц' => 'ц',
-    'Ҵ' => 'ҵ',
     'Ч' => 'ч',
-    'Ҷ' => 'ҷ',
-    'Ӌ' => 'ӌ',
-    'Ҹ' => 'ҹ',
-    'Ҽ' => 'ҽ',
-    'Ҿ' => 'ҿ',
-    'Џ' => 'џ',
+    'Ш' => 'ш',
     'Щ' => 'щ',
     'Ъ' => 'ъ',
     'Ы' => 'ы',
-    'Ӹ' => 'ӹ',
     'Ь' => 'ь',
-    'Ҍ' => 'ҍ',
     'Э' => 'э',
-    'Ӭ' => 'ӭ',
     'Ю' => 'ю',
     'Я' => 'я',
+    'Ѡ' => 'ѡ',
+    'Ѣ' => 'ѣ',
     'Ѥ' => 'ѥ',
     'Ѧ' => 'ѧ',
     'Ѩ' => 'ѩ',
+    'Ѫ' => 'ѫ',
     'Ѭ' => 'ѭ',
     'Ѯ' => 'ѯ',
     'Ѱ' => 'ѱ',
     'Ѳ' => 'ѳ',
     'Ѵ' => 'ѵ',
+    'Ѷ' => 'ѷ',
+    'Ѹ' => 'ѹ',
+    'Ѻ' => 'ѻ',
+    'Ѽ' => 'ѽ',
+    'Ѿ' => 'ѿ',
+    'Ҁ' => 'ҁ',
+    'Ҋ' => 'ҋ',
+    'Ҍ' => 'ҍ',
+    'Ҏ' => 'ҏ',
+    'Ґ' => 'ґ',
+    'Ғ' => 'ғ',
+    'Ҕ' => 'ҕ',
+    'Җ' => 'җ',
+    'Ҙ' => 'ҙ',
+    'Қ' => 'қ',
+    'Ҝ' => 'ҝ',
+    'Ҟ' => 'ҟ',
+    'Ҡ' => 'ҡ',
+    'Ң' => 'ң',
+    'Ҥ' => 'ҥ',
+    'Ҧ' => 'ҧ',
     'Ҩ' => 'ҩ',
+    'Ҫ' => 'ҫ',
+    'Ҭ' => 'ҭ',
+    'Ү' => 'ү',
+    'Ұ' => 'ұ',
+    'Ҳ' => 'ҳ',
+    'Ҵ' => 'ҵ',
+    'Ҷ' => 'ҷ',
+    'Ҹ' => 'ҹ',
+    'Һ' => 'һ',
+    'Ҽ' => 'ҽ',
+    'Ҿ' => 'ҿ',
+    'Ӂ' => 'ӂ',
+    'Ӄ' => 'ӄ',
+    'Ӆ' => 'ӆ',
+    'Ӈ' => 'ӈ',
+    'Ӊ' => 'ӊ',
+    'Ӌ' => 'ӌ',
+    'Ӎ' => 'ӎ',
+    'Ӑ' => 'ӑ',
+    'Ӓ' => 'ӓ',
+    'Ӕ' => 'ӕ',
+    'Ӗ' => 'ӗ',
+    'Ә' => 'ә',
+    'Ӛ' => 'ӛ',
+    'Ӝ' => 'ӝ',
+    'Ӟ' => 'ӟ',
+    'Ӡ' => 'ӡ',
+    'Ӣ' => 'ӣ',
+    'Ӥ' => 'ӥ',
+    'Ӧ' => 'ӧ',
+    'Ө' => 'ө',
+    'Ӫ' => 'ӫ',
+    'Ӭ' => 'ӭ',
+    'Ӯ' => 'ӯ',
+    'Ӱ' => 'ӱ',
+    'Ӳ' => 'ӳ',
+    'Ӵ' => 'ӵ',
+    'Ӹ' => 'ӹ',
+    'Ԁ' => 'ԁ',
+    'Ԃ' => 'ԃ',
+    'Ԅ' => 'ԅ',
+    'Ԇ' => 'ԇ',
+    'Ԉ' => 'ԉ',
+    'Ԋ' => 'ԋ',
+    'Ԍ' => 'ԍ',
+    'Ԏ' => 'ԏ',
     'Ա' => 'ա',
     'Բ' => 'բ',
     'Գ' => 'գ',
     'Դ' => 'դ',
     'Ե' => 'ե',
+    'Զ' => 'զ',
     'Է' => 'է',
     'Ը' => 'ը',
     'Թ' => 'թ',
     'Ժ' => 'ժ',
     'Ի' => 'ի',
     'Լ' => 'լ',
+    'Խ' => 'խ',
     'Ծ' => 'ծ',
     'Կ' => 'կ',
     'Հ' => 'հ',
     'Ձ' => 'ձ',
     'Ղ' => 'ղ',
     'Ճ' => 'ճ',
+    'Մ' => 'մ',
     'Յ' => 'յ',
     'Ն' => 'ն',
     'Շ' => 'շ',
     'Ո' => 'ո',
     'Չ' => 'չ',
     'Պ' => 'պ',
+    'Ջ' => 'ջ',
     'Ռ' => 'ռ',
     'Ս' => 'ս',
     'Վ' => 'վ',
     'Տ' => 'տ',
     'Ր' => 'ր',
     'Ց' => 'ց',
+    'Ւ' => 'ւ',
     'Փ' => 'փ',
     'Ք' => 'ք',
     'Օ' => 'օ',
     'Ֆ' => 'ֆ',
+    'Ḁ' => 'ḁ',
+    'Ḃ' => 'ḃ',
+    'Ḅ' => 'ḅ',
+    'Ḇ' => 'ḇ',
+    'Ḉ' => 'ḉ',
+    'Ḋ' => 'ḋ',
+    'Ḍ' => 'ḍ',
+    'Ḏ' => 'ḏ',
+    'Ḑ' => 'ḑ',
+    'Ḓ' => 'ḓ',
+    'Ḕ' => 'ḕ',
+    'Ḗ' => 'ḗ',
+    'Ḙ' => 'ḙ',
+    'Ḛ' => 'ḛ',
+    'Ḝ' => 'ḝ',
+    'Ḟ' => 'ḟ',
+    'Ḡ' => 'ḡ',
+    'Ḣ' => 'ḣ',
+    'Ḥ' => 'ḥ',
+    'Ḧ' => 'ḧ',
+    'Ḩ' => 'ḩ',
+    'Ḫ' => 'ḫ',
+    'Ḭ' => 'ḭ',
+    'Ḯ' => 'ḯ',
+    'Ḱ' => 'ḱ',
+    'Ḳ' => 'ḳ',
+    'Ḵ' => 'ḵ',
+    'Ḷ' => 'ḷ',
+    'Ḹ' => 'ḹ',
+    'Ḻ' => 'ḻ',
+    'Ḽ' => 'ḽ',
+    'Ḿ' => 'ḿ',
+    'Ṁ' => 'ṁ',
+    'Ṃ' => 'ṃ',
+    'Ṅ' => 'ṅ',
+    'Ṇ' => 'ṇ',
+    'Ṉ' => 'ṉ',
+    'Ṋ' => 'ṋ',
+    'Ṍ' => 'ṍ',
+    'Ṏ' => 'ṏ',
+    'Ṑ' => 'ṑ',
+    'Ṓ' => 'ṓ',
+    'Ṕ' => 'ṕ',
+    'Ṗ' => 'ṗ',
+    'Ṙ' => 'ṙ',
+    'Ṛ' => 'ṛ',
+    'Ṝ' => 'ṝ',
+    'Ṟ' => 'ṟ',
+    'Ṡ' => 'ṡ',
+    'Ṣ' => 'ṣ',
+    'Ṥ' => 'ṥ',
+    'Ṧ' => 'ṧ',
+    'Ṩ' => 'ṩ',
+    'Ṫ' => 'ṫ',
+    'Ṭ' => 'ṭ',
+    'Ṯ' => 'ṯ',
+    'Ṱ' => 'ṱ',
+    'Ṳ' => 'ṳ',
+    'Ṵ' => 'ṵ',
+    'Ṷ' => 'ṷ',
+    'Ṹ' => 'ṹ',
+    'Ṻ' => 'ṻ',
+    'Ṽ' => 'ṽ',
+    'Ṿ' => 'ṿ',
+    'Ẁ' => 'ẁ',
+    'Ẃ' => 'ẃ',
+    'Ẅ' => 'ẅ',
+    'Ẇ' => 'ẇ',
+    'Ẉ' => 'ẉ',
+    'Ẋ' => 'ẋ',
+    'Ẍ' => 'ẍ',
+    'Ẏ' => 'ẏ',
+    'Ẑ' => 'ẑ',
+    'Ẓ' => 'ẓ',
+    'Ẕ' => 'ẕ',
+    'Ạ' => 'ạ',
+    'Ả' => 'ả',
+    'Ấ' => 'ấ',
+    'Ầ' => 'ầ',
+    'Ẩ' => 'ẩ',
+    'Ẫ' => 'ẫ',
+    'Ậ' => 'ậ',
+    'Ắ' => 'ắ',
+    'Ằ' => 'ằ',
+    'Ẳ' => 'ẳ',
+    'Ẵ' => 'ẵ',
+    'Ặ' => 'ặ',
+    'Ẹ' => 'ẹ',
+    'Ẻ' => 'ẻ',
+    'Ẽ' => 'ẽ',
+    'Ế' => 'ế',
+    'Ề' => 'ề',
+    'Ể' => 'ể',
+    'Ễ' => 'ễ',
+    'Ệ' => 'ệ',
+    'Ỉ' => 'ỉ',
+    'Ị' => 'ị',
+    'Ọ' => 'ọ',
+    'Ỏ' => 'ỏ',
+    'Ố' => 'ố',
+    'Ồ' => 'ồ',
+    'Ổ' => 'ổ',
+    'Ỗ' => 'ỗ',
+    'Ộ' => 'ộ',
+    'Ớ' => 'ớ',
+    'Ờ' => 'ờ',
+    'Ở' => 'ở',
+    'Ỡ' => 'ỡ',
+    'Ợ' => 'ợ',
+    'Ụ' => 'ụ',
+    'Ủ' => 'ủ',
+    'Ứ' => 'ứ',
+    'Ừ' => 'ừ',
+    'Ử' => 'ử',
+    'Ữ' => 'ữ',
+    'Ự' => 'ự',
+    'Ỳ' => 'ỳ',
+    'Ỵ' => 'ỵ',
+    'Ỷ' => 'ỷ',
+    'Ỹ' => 'ỹ',
+    'Ἀ' => 'ἀ',
+    'Ἁ' => 'ἁ',
+    'Ἂ' => 'ἂ',
+    'Ἃ' => 'ἃ',
+    'Ἄ' => 'ἄ',
+    'Ἅ' => 'ἅ',
+    'Ἆ' => 'ἆ',
+    'Ἇ' => 'ἇ',
+    'Ἐ' => 'ἐ',
+    'Ἑ' => 'ἑ',
+    'Ἒ' => 'ἒ',
+    'Ἓ' => 'ἓ',
+    'Ἔ' => 'ἔ',
+    'Ἕ' => 'ἕ',
+    'Ἡ' => 'ἡ',
+    'Ἢ' => 'ἢ',
+    'Ἣ' => 'ἣ',
+    'Ἤ' => 'ἤ',
+    'Ἥ' => 'ἥ',
+    'Ἦ' => 'ἦ',
+    'Ἧ' => 'ἧ',
+    'Ἰ' => 'ἰ',
+    'Ἱ' => 'ἱ',
+    'Ἲ' => 'ἲ',
+    'Ἳ' => 'ἳ',
+    'Ἴ' => 'ἴ',
+    'Ἵ' => 'ἵ',
+    'Ἶ' => 'ἶ',
+    'Ἷ' => 'ἷ',
+    'Ὀ' => 'ὀ',
+    'Ὁ' => 'ὁ',
+    'Ὂ' => 'ὂ',
+    'Ὃ' => 'ὃ',
+    'Ὄ' => 'ὄ',
+    'Ὅ' => 'ὅ',
+    'Ὑ' => 'ὑ',
+    'Ὓ' => 'ὓ',
+    'Ὕ' => 'ὕ',
+    'Ὗ' => 'ὗ',
+    'Ὡ' => 'ὡ',
+    'Ὢ' => 'ὢ',
+    'Ὣ' => 'ὣ',
+    'Ὤ' => 'ὤ',
+    'Ὥ' => 'ὥ',
+    'Ὦ' => 'ὦ',
+    'Ὧ' => 'ὧ',
+    'ᾈ' => 'ᾀ',
+    'ᾉ' => 'ᾁ',
+    'ᾊ' => 'ᾂ',
+    'ᾋ' => 'ᾃ',
+    'ᾌ' => 'ᾄ',
+    'ᾍ' => 'ᾅ',
+    'ᾎ' => 'ᾆ',
+    'ᾏ' => 'ᾇ',
+    'ᾘ' => 'ᾐ',
+    'ᾙ' => 'ᾑ',
+    'ᾚ' => 'ᾒ',
+    'ᾛ' => 'ᾓ',
+    'ᾜ' => 'ᾔ',
+    'ᾝ' => 'ᾕ',
+    'ᾞ' => 'ᾖ',
+    'ᾟ' => 'ᾗ',
+    'ᾩ' => 'ᾡ',
+    'ᾪ' => 'ᾢ',
+    'ᾫ' => 'ᾣ',
+    'ᾬ' => 'ᾤ',
+    'ᾭ' => 'ᾥ',
+    'ᾮ' => 'ᾦ',
+    'ᾯ' => 'ᾧ',
+    'Ᾰ' => 'ᾰ',
+    'Ᾱ' => 'ᾱ',
+    'Ὰ' => 'ὰ',
+    'ᾼ' => 'ᾳ',
+    'Ὲ' => 'ὲ',
+    'Ὴ' => 'ὴ',
+    'ῌ' => 'ῃ',
+    'Ῐ' => 'ῐ',
+    'Ῑ' => 'ῑ',
+    'Ὶ' => 'ὶ',
+    'Ῡ' => 'ῡ',
+    'Ὺ' => 'ὺ',
+    'Ῥ' => 'ῥ',
+    'Ὸ' => 'ὸ',
+    'Ὼ' => 'ὼ',
+    'ῼ' => 'ῳ',
+    'Ａ' => 'ａ',
+    'Ｂ' => 'ｂ',
+    'Ｃ' => 'ｃ',
+    'Ｄ' => 'ｄ',
+    'Ｅ' => 'ｅ',
+    'Ｆ' => 'ｆ',
+    'Ｇ' => 'ｇ',
+    'Ｈ' => 'ｈ',
+    'Ｉ' => 'ｉ',
+    'Ｊ' => 'ｊ',
+    'Ｋ' => 'ｋ',
+    'Ｌ' => 'ｌ',
+    'Ｍ' => 'ｍ',
+    'Ｎ' => 'ｎ',
+    'Ｏ' => 'ｏ',
+    'Ｐ' => 'ｐ',
+    'Ｑ' => 'ｑ',
+    'Ｒ' => 'ｒ',
+    'Ｓ' => 'ｓ',
+    'Ｔ' => 'ｔ',
+    'Ｕ' => 'ｕ',
+    'Ｖ' => 'ｖ',
+    'Ｗ' => 'ｗ',
+    'Ｘ' => 'ｘ',
+    'Ｙ' => 'ｙ',
+    'Ｚ' => 'ｚ',
 ];