dwrite: Allow underscores in script names.

dlls/dwrite/scripts.h

@@ -10,7 +10,7 @@ enum unicode_script_id {
     Script_Avestan = 4,
     Script_Balinese = 5,
     Script_Bamum = 6,
-    Script_Bassa = 7,
+    Script_Bassa_Vah = 7,
     Script_Batak = 8,
     Script_Bengali = 9,
     Script_Bopomofo = 10,
@@ -18,9 +18,9 @@ enum unicode_script_id {
     Script_Braille = 12,
     Script_Buginese = 13,
     Script_Buhid = 14,
-    Script_Canadian = 15,
+    Script_Canadian_Aboriginal = 15,
     Script_Carian = 16,
-    Script_Caucasian = 17,
+    Script_Caucasian_Albanian = 17,
     Script_Chakma = 18,
     Script_Cham = 19,
     Script_Cherokee = 20,
@@ -31,7 +31,7 @@ enum unicode_script_id {
     Script_Deseret = 25,
     Script_Devanagari = 26,
     Script_Duployan = 27,
-    Script_Egyptian = 28,
+    Script_Egyptian_Hieroglyphs = 28,
     Script_Elbasan = 29,
     Script_Ethiopic = 30,
     Script_Georgian = 31,
@@ -46,76 +46,86 @@ enum unicode_script_id {
     Script_Hanunoo = 40,
     Script_Hebrew = 41,
     Script_Hiragana = 42,
-    Script_Imperial = 43,
-    Script_Inscriptional = 44,
-    Script_Javanese = 45,
-    Script_Kaithi = 46,
-    Script_Kannada = 47,
-    Script_Katakana = 48,
-    Script_Kayah = 49,
-    Script_Kharoshthi = 50,
-    Script_Khmer = 51,
-    Script_Khojki = 52,
-    Script_Khudawadi = 53,
-    Script_Lao = 54,
-    Script_Latin = 55,
-    Script_Lepcha = 56,
-    Script_Limbu = 57,
-    Script_Linear = 58,
-    Script_Lisu = 59,
-    Script_Lycian = 60,
-    Script_Lydian = 61,
-    Script_Mahajani = 62,
-    Script_Malayalam = 63,
-    Script_Mandaic = 64,
-    Script_Manichaean = 65,
-    Script_Meetei = 66,
-    Script_Mende = 67,
-    Script_Meroitic = 68,
-    Script_Miao = 69,
-    Script_Modi = 70,
-    Script_Mongolian = 71,
-    Script_Mro = 72,
-    Script_Myanmar = 73,
-    Script_Nabataean = 74,
-    Script_New = 75,
-    Script_Nko = 76,
-    Script_Ogham = 77,
-    Script_Ol = 78,
-    Script_Old = 79,
-    Script_Oriya = 80,
-    Script_Osmanya = 81,
-    Script_Pahawh = 82,
-    Script_Palmyrene = 83,
-    Script_Pau = 84,
-    Script_Phags = 85,
-    Script_Phoenician = 86,
-    Script_Psalter = 87,
-    Script_Rejang = 88,
-    Script_Runic = 89,
-    Script_Samaritan = 90,
-    Script_Saurashtra = 91,
-    Script_Sharada = 92,
-    Script_Shavian = 93,
-    Script_Siddham = 94,
-    Script_Sinhala = 95,
-    Script_Sora = 96,
-    Script_Sundanese = 97,
-    Script_Syloti = 98,
-    Script_Syriac = 99,
-    Script_Tagalog = 100,
-    Script_Tagbanwa = 101,
-    Script_Tai = 102,
-    Script_Takri = 103,
-    Script_Tamil = 104,
-    Script_Telugu = 105,
-    Script_Thaana = 106,
-    Script_Thai = 107,
-    Script_Tibetan = 108,
-    Script_Tifinagh = 109,
-    Script_Tirhuta = 110,
-    Script_Ugaritic = 111,
-    Script_Vai = 112,
-    Script_Warang = 113,
-    Script_Yi = 114,
+    Script_Imperial_Aramaic = 43,
+    Script_Inscriptional_Pahlavi = 44,
+    Script_Inscriptional_Parthian = 45,
+    Script_Javanese = 46,
+    Script_Kaithi = 47,
+    Script_Kannada = 48,
+    Script_Katakana = 49,
+    Script_Kayah_Li = 50,
+    Script_Kharoshthi = 51,
+    Script_Khmer = 52,
+    Script_Khojki = 53,
+    Script_Khudawadi = 54,
+    Script_Lao = 55,
+    Script_Latin = 56,
+    Script_Lepcha = 57,
+    Script_Limbu = 58,
+    Script_Linear_A = 59,
+    Script_Linear_B = 60,
+    Script_Lisu = 61,
+    Script_Lycian = 62,
+    Script_Lydian = 63,
+    Script_Mahajani = 64,
+    Script_Malayalam = 65,
+    Script_Mandaic = 66,
+    Script_Manichaean = 67,
+    Script_Meetei_Mayek = 68,
+    Script_Mende_Kikakui = 69,
+    Script_Meroitic_Cursive = 70,
+    Script_Meroitic_Hieroglyphs = 71,
+    Script_Miao = 72,
+    Script_Modi = 73,
+    Script_Mongolian = 74,
+    Script_Mro = 75,
+    Script_Myanmar = 76,
+    Script_Nabataean = 77,
+    Script_New_Tai_Lue = 78,
+    Script_Nko = 79,
+    Script_Ogham = 80,
+    Script_Ol_Chiki = 81,
+    Script_Old_Italic = 82,
+    Script_Old_North_Arabian = 83,
+    Script_Old_Permic = 84,
+    Script_Old_Persian = 85,
+    Script_Old_South_Arabian = 86,
+    Script_Old_Turkic = 87,
+    Script_Oriya = 88,
+    Script_Osmanya = 89,
+    Script_Pahawh_Hmong = 90,
+    Script_Palmyrene = 91,
+    Script_Pau_Cin_Hau = 92,
+    Script_Phags_Pa = 93,
+    Script_Phoenician = 94,
+    Script_Psalter_Pahlavi = 95,
+    Script_Rejang = 96,
+    Script_Runic = 97,
+    Script_Samaritan = 98,
+    Script_Saurashtra = 99,
+    Script_Sharada = 100,
+    Script_Shavian = 101,
+    Script_Siddham = 102,
+    Script_Sinhala = 103,
+    Script_Sora_Sompeng = 104,
+    Script_Sundanese = 105,
+    Script_Syloti_Nagri = 106,
+    Script_Syriac = 107,
+    Script_Tagalog = 108,
+    Script_Tagbanwa = 109,
+    Script_Tai_Le = 110,
+    Script_Tai_Tham = 111,
+    Script_Tai_Viet = 112,
+    Script_Takri = 113,
+    Script_Tamil = 114,
+    Script_Telugu = 115,
+    Script_Thaana = 116,
+    Script_Thai = 117,
+    Script_Tibetan = 118,
+    Script_Tifinagh = 119,
+    Script_Tirhuta = 120,
+    Script_Ugaritic = 121,
+    Script_Vai = 122,
+    Script_Warang_Citi = 123,
+    Script_Yi = 124,
 };

tools/make_unicode

@@ -1313,11 +1313,11 @@ sub dump_scripts($)
         next if /^\#/;  # skip comments
         next if /^\s*$/;  # skip empty lines
         next if /\x1a/;  # skip ^Z
-        if (/^\s*([0-9a-fA-F]+)\s*;\s*([a-zA-Z]+)\s*/)
+        if (/^\s*([0-9a-fA-F]+)\s*;\s*([_a-zA-Z]+)\s*/)
         {
             $type = $2;
         }
-        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([a-zA-Z]+)\s*/)
+        elsif (/^\s*([0-9a-fA-F]+)..\s*([0-9a-fA-F]+)\s*;\s*([_a-zA-Z]+)\s*/)
         {
             $type = $3;
         }