From 16d1d9c97a3c38f9685e53724faa908f497d98ac Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 19 Mar 2020 21:36:11 +0000 Subject: [PATCH] update tables data to CLDR v36.1 Signed-off-by: Ivailo Monev --- README | 2 +- scripts/genlocale.py | 19 +- src/core/tools/qlocale.cpp | 2 +- src/core/tools/qlocale.h | 330 +++++++++++++++-------------- src/core/tools/qlocale.qdoc | 38 +++- src/core/tools/qlocale_data_p.h | 8 +- src/gui/text/qfontdatabase_x11_p.h | 22 +- 7 files changed, 241 insertions(+), 180 deletions(-) diff --git a/README b/README index 290608a1f..b77206ef4 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ There are several things you should be aware before considering Katie: - moc, uic, rcc, lrelease, lupdate, etc. are linked to components - updated bundled Harfbuzz from upstream (not Harfbuzz-NG) - updated bundled FFTW and Valgrind from upstream - - updated localizations data from Common Locale Data Repository v36 + - updated localizations data from Common Locale Data Repository v36.1 - SQLite driver uses UTF-8 encoding instead of UTF-16 - default text codec for C-strings is UTF-8 - Symbian, QWS, QPA, Mac and Windows are no longer supported platforms diff --git a/scripts/genlocale.py b/scripts/genlocale.py index e3b77da99..5aa9b9282 100755 --- a/scripts/genlocale.py +++ b/scripts/genlocale.py @@ -1,12 +1,13 @@ #!/usr/bin/python3 #-*- coding: UTF-8 -*- -# Data is from https://unicode.org/Public/cldr/36/core.zip +# Data is from https://unicode.org/Public/cldr/36.1/core.zip import os, sys, glob, re import xml.etree.ElementTree as ET printenumsandexit = ('--printenums' in sys.argv) +printdocsandexit = ('--printdocs' in sys.argv) def mapcopy(frommap, tomap): for key in frommap.keys(): @@ -312,6 +313,15 @@ def printenum(frommap, prefix): print('\n Last%s = %s' % (prefix, lastkey)) print(' };\n') +def printdoc(frommap, prefix): + print('// %s' % prefix) + for key in sorted(frommap.keys()): + if key in ('Any%s' % prefix, 'C'): + continue + code = frommap[key]['code'] + name = frommap[key]['name'] + print(' \\value %s' % key) + print('') def printtable(frommap, prefix): lowerprefix = prefix.lower() @@ -575,6 +585,8 @@ for language in root.findall('./localeDisplayNames/languages/language'): if printenumsandexit: printenum(languagemap, 'Language') +elif printdocsandexit: + printdoc(languagemap, 'Language') else: printtable(languagemap, 'Language') @@ -589,6 +601,8 @@ for country in root.findall('./localeDisplayNames/territories/territory'): if printenumsandexit: printenum(countrymap, 'Country') +elif printdocsandexit: + printdoc(countrymap, 'Country') else: printtable(countrymap, 'Country') @@ -610,6 +624,9 @@ for script in root.findall('./localeDisplayNames/scripts/script'): if printenumsandexit: printenum(scriptmap, 'Script') sys.exit(0) +elif printdocsandexit: + printdoc(scriptmap, 'Script') + sys.exit(0) else: printtable(scriptmap, 'Script') diff --git a/src/core/tools/qlocale.cpp b/src/core/tools/qlocale.cpp index cd8aebb0f..a93b322f5 100644 --- a/src/core/tools/qlocale.cpp +++ b/src/core/tools/qlocale.cpp @@ -85,7 +85,7 @@ QLocale::Language QLocalePrivate::codeToLanguage(const QString &code) } for (qint16 i = 0; i < languageTblSize; i++) { - if (QString::fromLatin1(languageTbl[i].code) == lower) + if (QString::fromLatin1(languageTbl[i].code) == lower) return languageTbl[i].language; } diff --git a/src/core/tools/qlocale.h b/src/core/tools/qlocale.h index ac11f9990..24e518c7f 100644 --- a/src/core/tools/qlocale.h +++ b/src/core/tools/qlocale.h @@ -1117,169 +1117,173 @@ public: ChakmaScript = 23, ChamScript = 24, CherokeeScript = 25, - CirthScript = 26, - CopticScript = 27, - CypriotScript = 28, - CyrillicScript = 29, - DeseretScript = 30, - DevanagariScript = 31, - DograScript = 32, - DuployanshorthandScript = 33, - EasternSyriacScript = 34, - EgyptiandemoticScript = 35, - EgyptianhieraticScript = 36, - EgyptianhieroglyphsScript = 37, - ElbasanScript = 38, - ElymaicScript = 39, - EmojiScript = 40, - EstrangeloSyriacScript = 41, - EthiopicScript = 42, - FrakturLatinScript = 43, - FraserScript = 44, - GaelicLatinScript = 45, - GeorgianKhutsuriScript = 46, - GeorgianScript = 47, - GlagoliticScript = 48, - GothicScript = 49, - GranthaScript = 50, - GreekScript = 51, - GujaratiScript = 52, - GunjalaGondiScript = 53, - GurmukhiScript = 54, - HanScript = 55, - HangulScript = 56, - HanifiRohingyaScript = 57, - HanunooScript = 58, - HanwithBopomofoScript = 59, - HatranScript = 60, - HebrewScript = 61, - HiraganaScript = 62, - ImperialAramaicScript = 63, - IndusScript = 64, - InheritedScript = 65, - InscriptionalPahlaviScript = 66, - InscriptionalParthianScript = 67, - JamoScript = 68, - JapaneseScript = 69, - JapanesesyllabariesScript = 70, - JavaneseScript = 71, - JurchenScript = 72, - KaithiScript = 73, - KannadaScript = 74, - KatakanaScript = 75, - KayahLiScript = 76, - KharoshthiScript = 77, - KhmerScript = 78, - KhojkiScript = 79, - KhudawadiScript = 80, - KoreanScript = 81, - KpelleScript = 82, - LannaScript = 83, - LaoScript = 84, - LatinScript = 85, - LepchaScript = 86, - LimbuScript = 87, - LinearAScript = 88, - LinearBScript = 89, - LomaScript = 90, - LycianScript = 91, - LydianScript = 92, - MahajaniScript = 93, - MakasarScript = 94, - MalayalamScript = 95, - MandaeanScript = 96, - ManichaeanScript = 97, - MarchenScript = 98, - MasaramGondiScript = 99, - MathematicalNotationScript = 100, - MayanhieroglyphsScript = 101, - MedefaidrinScript = 102, - MeiteiMayekScript = 103, - MendeScript = 104, - MeroiticCursiveScript = 105, - MeroiticScript = 106, - ModiScript = 107, - MongolianScript = 108, - MoonScript = 109, - MroScript = 110, - MultaniScript = 111, - MyanmarScript = 112, - NKoScript = 113, - NabataeanScript = 114, - NandinagariScript = 115, - NaxiGebaScript = 116, - NewTaiLueScript = 117, - NewaScript = 118, - NushuScript = 119, - NyiakengPuachueHmongScript = 120, - OdiaScript = 121, - OghamScript = 122, - OlChikiScript = 123, - OldChurchSlavonicCyrillicScript = 124, - OldHungarianScript = 125, - OldItalicScript = 126, - OldNorthArabianScript = 127, - OldPermicScript = 128, - OldPersianScript = 129, - OldSogdianScript = 130, - OldSouthArabianScript = 131, - OrkhonScript = 132, - OsageScript = 133, - OsmanyaScript = 134, - PahawhHmongScript = 135, - PalmyreneScript = 136, - PauCinHauScript = 137, - PhagspaScript = 138, - PhoenicianScript = 139, - PollardPhoneticScript = 140, - PsalterPahlaviScript = 141, - RejangScript = 142, - RongorongoScript = 143, - RunicScript = 144, - SACuneiformScript = 145, - SamaritanScript = 146, - SaratiScript = 147, - SaurashtraScript = 148, - SharadaScript = 149, - ShavianScript = 150, - SiddhamScript = 151, - SignWritingScript = 152, - SimplifiedHanScript = 153, - SinhalaScript = 154, - SogdianScript = 155, - SoraSompengScript = 156, - SoyomboScript = 157, - SundaneseScript = 158, - SylotiNagriScript = 159, - SymbolsScript = 160, - SyriacScript = 161, - TagalogScript = 162, - TagbanwaScript = 163, - TaiLeScript = 164, - TaiVietScript = 165, - TakriScript = 166, - TamilScript = 167, - TangutScript = 168, - TeluguScript = 169, - TengwarScript = 170, - ThaanaScript = 171, - ThaiScript = 172, - TibetanScript = 173, - TifinaghScript = 174, - TirhutaScript = 175, - TraditionalHanScript = 176, - UCASScript = 177, - UgariticScript = 178, - UnwrittenScript = 179, - VaiScript = 180, - VarangKshitiScript = 181, - VisibleSpeechScript = 182, - WanchoScript = 183, - WesternSyriacScript = 184, - WoleaiScript = 185, - YiScript = 186, - ZanabazarSquareScript = 187, - ZawgyiScript = 188, + ChorasmianScript = 26, + CirthScript = 27, + CopticScript = 28, + CypriotScript = 29, + CyrillicScript = 30, + DeseretScript = 31, + DevanagariScript = 32, + DivesAkuruScript = 33, + DograScript = 34, + DuployanshorthandScript = 35, + EasternSyriacScript = 36, + EgyptiandemoticScript = 37, + EgyptianhieraticScript = 38, + EgyptianhieroglyphsScript = 39, + ElbasanScript = 40, + ElymaicScript = 41, + EmojiScript = 42, + EstrangeloSyriacScript = 43, + EthiopicScript = 44, + FrakturLatinScript = 45, + FraserScript = 46, + GaelicLatinScript = 47, + GeorgianKhutsuriScript = 48, + GeorgianScript = 49, + GlagoliticScript = 50, + GothicScript = 51, + GranthaScript = 52, + GreekScript = 53, + GujaratiScript = 54, + GunjalaGondiScript = 55, + GurmukhiScript = 56, + HanScript = 57, + HangulScript = 58, + HanifiRohingyaScript = 59, + HanunooScript = 60, + HanwithBopomofoScript = 61, + HatranScript = 62, + HebrewScript = 63, + HiraganaScript = 64, + ImperialAramaicScript = 65, + IndusScript = 66, + InheritedScript = 67, + InscriptionalPahlaviScript = 68, + InscriptionalParthianScript = 69, + JamoScript = 70, + JapaneseScript = 71, + JapanesesyllabariesScript = 72, + JavaneseScript = 73, + JurchenScript = 74, + KaithiScript = 75, + KannadaScript = 76, + KatakanaScript = 77, + KayahLiScript = 78, + KharoshthiScript = 79, + KhitansmallscriptScript = 80, + KhmerScript = 81, + KhojkiScript = 82, + KhudawadiScript = 83, + KoreanScript = 84, + KpelleScript = 85, + LannaScript = 86, + LaoScript = 87, + LatinScript = 88, + LepchaScript = 89, + LimbuScript = 90, + LinearAScript = 91, + LinearBScript = 92, + LomaScript = 93, + LycianScript = 94, + LydianScript = 95, + MahajaniScript = 96, + MakasarScript = 97, + MalayalamScript = 98, + MandaeanScript = 99, + ManichaeanScript = 100, + MarchenScript = 101, + MasaramGondiScript = 102, + MathematicalNotationScript = 103, + MayanhieroglyphsScript = 104, + MedefaidrinScript = 105, + MeiteiMayekScript = 106, + MendeScript = 107, + MeroiticCursiveScript = 108, + MeroiticScript = 109, + ModiScript = 110, + MongolianScript = 111, + MoonScript = 112, + MroScript = 113, + MultaniScript = 114, + MyanmarScript = 115, + NKoScript = 116, + NabataeanScript = 117, + NandinagariScript = 118, + NaxiGebaScript = 119, + NewTaiLueScript = 120, + NewaScript = 121, + NushuScript = 122, + NyiakengPuachueHmongScript = 123, + OdiaScript = 124, + OghamScript = 125, + OlChikiScript = 126, + OldChurchSlavonicCyrillicScript = 127, + OldHungarianScript = 128, + OldItalicScript = 129, + OldNorthArabianScript = 130, + OldPermicScript = 131, + OldPersianScript = 132, + OldSogdianScript = 133, + OldSouthArabianScript = 134, + OrkhonScript = 135, + OsageScript = 136, + OsmanyaScript = 137, + PahawhHmongScript = 138, + PalmyreneScript = 139, + PauCinHauScript = 140, + PhagspaScript = 141, + PhoenicianScript = 142, + PollardPhoneticScript = 143, + PsalterPahlaviScript = 144, + RejangScript = 145, + RongorongoScript = 146, + RunicScript = 147, + SACuneiformScript = 148, + SamaritanScript = 149, + SaratiScript = 150, + SaurashtraScript = 151, + SharadaScript = 152, + ShavianScript = 153, + SiddhamScript = 154, + SignWritingScript = 155, + SimplifiedHanScript = 156, + SinhalaScript = 157, + SogdianScript = 158, + SoraSompengScript = 159, + SoyomboScript = 160, + SundaneseScript = 161, + SylotiNagriScript = 162, + SymbolsScript = 163, + SyriacScript = 164, + TagalogScript = 165, + TagbanwaScript = 166, + TaiLeScript = 167, + TaiVietScript = 168, + TakriScript = 169, + TamilScript = 170, + TangutScript = 171, + TeluguScript = 172, + TengwarScript = 173, + ThaanaScript = 174, + ThaiScript = 175, + TibetanScript = 176, + TifinaghScript = 177, + TirhutaScript = 178, + TraditionalHanScript = 179, + UCASScript = 180, + UgariticScript = 181, + UnwrittenScript = 182, + VaiScript = 183, + VarangKshitiScript = 184, + VisibleSpeechScript = 185, + WanchoScript = 186, + WesternSyriacScript = 187, + WoleaiScript = 188, + YezidiScript = 189, + YiScript = 190, + ZanabazarSquareScript = 191, + ZawgyiScript = 192, PersoArabicScript = ArabicScript, SimplifiedScript = SimplifiedHanScript, diff --git a/src/core/tools/qlocale.qdoc b/src/core/tools/qlocale.qdoc index d677b0dcf..90a325a6d 100644 --- a/src/core/tools/qlocale.qdoc +++ b/src/core/tools/qlocale.qdoc @@ -91,7 +91,7 @@ \note For the current keyboard input locale take a look at QApplication::keyboardInputLocale(). - QLocale's data is based on Common Locale Data Repository v36. + QLocale's data is based on Common Locale Data Repository v36.1. The double-to-string and string-to-double conversion functions are covered by the following licenses: @@ -168,6 +168,7 @@ \value Awadhi \value Aymara \value Azerbaijani + \value Azeri \value Badaga \value Bafia \value Bafut @@ -233,6 +234,8 @@ \value Chiga \value ChimborazoHighlandQuichua \value Chinese + \value ChineseCantonese + \value ChineseMandarin \value ChinookJargon \value Chipewyan \value Choctaw @@ -408,6 +411,7 @@ \value Kurukh \value Kutenai \value Kwasio + \value Kyrgyz \value Ladino \value Lahnda \value Lakota @@ -460,6 +464,7 @@ \value Maltese \value Manchu \value Mandar + \value MandarinChinese \value Mandingo \value Manipuri \value Manx @@ -502,6 +507,7 @@ \value Mundang \value Muscogee \value MuslimTat + \value MyanmarLanguage \value Myene \value NKo \value NajdiArabic @@ -571,6 +577,7 @@ \value Portuguese \value Prussian \value Punjabi + \value Pushto \value Quechua \value Rajasthani \value Rapanui @@ -624,6 +631,7 @@ \value Siksika \value Silesian \value SimplifiedChinese + \value SimplifiedMandarinChinese \value Sindhi \value Sinhala \value SkoltSami @@ -680,6 +688,7 @@ \value Tongan \value TornedalenFinnish \value TraditionalChinese + \value TraditionalMandarinChinese \value Tsakhur \value Tsakonian \value Tsimshian @@ -695,6 +704,8 @@ \value Tuvinian \value Twi \value Tyap + \value UKEnglish + \value USEnglish \value Udmurt \value Ugaritic \value Uighur @@ -703,6 +714,7 @@ \value Unknownlanguage \value UpperSorbian \value Urdu + \value Uyghur \value Uzbek \value Vai \value Venda @@ -788,6 +800,7 @@ \value Bhutan \value Bolivia \value Bosnia + \value BosniaAndHerzegovina \value Botswana \value BouvetIsland \value Brazil @@ -819,6 +832,8 @@ \value Comoros \value CongoBrazzaville \value CongoDRC + \value CongoKinshasa + \value CongoRepublic \value CookIslands \value CostaRica \value CotedIvoire @@ -827,6 +842,7 @@ \value Curacao \value Cyprus \value CzechRepublic + \value Czechia \value Denmark \value DiegoGarcia \value Djibouti @@ -848,6 +864,7 @@ \value EuropeanUnion \value Eurozone \value FalklandIslands + \value FalklandIslandsIslasMalvinas \value FaroeIslands \value Fiji \value Finland @@ -875,6 +892,7 @@ \value HeardAndMcDonaldIslands \value Honduras \value HongKong + \value HongKongSARChina \value Hungary \value Iceland \value India @@ -885,6 +903,7 @@ \value IsleofMan \value Israel \value Italy + \value IvoryCoast \value Jamaica \value Japan \value Jersey @@ -906,6 +925,7 @@ \value Lithuania \value Luxembourg \value Macao + \value MacaoSARChina \value Madagascar \value Malawi \value Malaysia @@ -930,6 +950,7 @@ \value Morocco \value Mozambique \value Myanmar + \value MyanmarBurma \value Namibia \value Nauru \value Nepal @@ -955,6 +976,7 @@ \value Pakistan \value Palau \value Palestine + \value PalestinianTerritories \value Panama \value PapuaNewGuinea \value Paraguay @@ -1008,6 +1030,7 @@ \value Sudan \value Suriname \value SvalbardAndJanMayen + \value Swaziland \value Sweden \value Switzerland \value Syria @@ -1015,6 +1038,7 @@ \value Tajikistan \value Tanzania \value Thailand + \value TimorLeste \value Togo \value Tokelau \value Tonga @@ -1031,6 +1055,9 @@ \value Uganda \value Ukraine \value UnitedArabEmirates + \value UnitedKingdom + \value UnitedNations + \value UnitedStates \value UnitedStatesOutlyingIslands \value UnitedStatesVirginIslands \value UnknownRegion @@ -1086,12 +1113,14 @@ \value ChakmaScript \value ChamScript \value CherokeeScript + \value ChorasmianScript \value CirthScript \value CopticScript \value CypriotScript \value CyrillicScript \value DeseretScript \value DevanagariScript + \value DivesAkuruScript \value DograScript \value DuployanshorthandScript \value EasternSyriacScript @@ -1138,6 +1167,7 @@ \value KatakanaScript \value KayahLiScript \value KharoshthiScript + \value KhitansmallscriptScript \value KhmerScript \value KhojkiScript \value KhudawadiScript @@ -1198,6 +1228,7 @@ \value PahawhHmongScript \value PalmyreneScript \value PauCinHauScript + \value PersoArabicScript \value PhagspaScript \value PhoenicianScript \value PollardPhoneticScript @@ -1214,10 +1245,12 @@ \value SiddhamScript \value SignWritingScript \value SimplifiedHanScript + \value SimplifiedScript \value SinhalaScript \value SogdianScript \value SoraSompengScript \value SoyomboScript + \value SumeroAkkadianCuneiformScript \value SundaneseScript \value SylotiNagriScript \value SymbolsScript @@ -1237,8 +1270,10 @@ \value TifinaghScript \value TirhutaScript \value TraditionalHanScript + \value TraditionalScript \value UCASScript \value UgariticScript + \value UnifiedCanadianAboriginalSyllabicsScript \value UnwrittenScript \value VaiScript \value VarangKshitiScript @@ -1246,6 +1281,7 @@ \value WanchoScript \value WesternSyriacScript \value WoleaiScript + \value YezidiScript \value YiScript \value ZanabazarSquareScript \value ZawgyiScript diff --git a/src/core/tools/qlocale_data_p.h b/src/core/tools/qlocale_data_p.h index f6194da3d..dde1014ab 100644 --- a/src/core/tools/qlocale_data_p.h +++ b/src/core/tools/qlocale_data_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /* - This part of the file was generated from Common Locale Data Repository v36 + This part of the file was generated from Common Locale Data Repository v36.1 http://www.unicode.org/cldr/ @@ -1021,12 +1021,14 @@ static const struct scriptTblData { { QLocale::Script::ChakmaScript, "Chakma\0", "Cakm\0" }, { QLocale::Script::ChamScript, "Cham\0", "Cham\0" }, { QLocale::Script::CherokeeScript, "Cherokee\0", "Cher\0" }, + { QLocale::Script::ChorasmianScript, "Chorasmian\0", "Chrs\0" }, { QLocale::Script::CirthScript, "Cirth\0", "Cirt\0" }, { QLocale::Script::CopticScript, "Coptic\0", "Copt\0" }, { QLocale::Script::CypriotScript, "Cypriot\0", "Cprt\0" }, { QLocale::Script::CyrillicScript, "Cyrillic\0", "Cyrl\0" }, { QLocale::Script::DeseretScript, "Deseret\0", "Dsrt\0" }, { QLocale::Script::DevanagariScript, "Devanagari\0", "Deva\0" }, + { QLocale::Script::DivesAkuruScript, "Dives Akuru\0", "Diak\0" }, { QLocale::Script::DograScript, "Dogra\0", "Dogr\0" }, { QLocale::Script::DuployanshorthandScript, "Duployan shorthand\0", "Dupl\0" }, { QLocale::Script::EasternSyriacScript, "Eastern Syriac\0", "Syrn\0" }, @@ -1073,6 +1075,7 @@ static const struct scriptTblData { { QLocale::Script::KatakanaScript, "Katakana\0", "Kana\0" }, { QLocale::Script::KayahLiScript, "Kayah Li\0", "Kali\0" }, { QLocale::Script::KharoshthiScript, "Kharoshthi\0", "Khar\0" }, + { QLocale::Script::KhitansmallscriptScript, "Khitan small script\0", "Kits\0" }, { QLocale::Script::KhmerScript, "Khmer\0", "Khmr\0" }, { QLocale::Script::KhojkiScript, "Khojki\0", "Khoj\0" }, { QLocale::Script::KhudawadiScript, "Khudawadi\0", "Sind\0" }, @@ -1181,6 +1184,7 @@ static const struct scriptTblData { { QLocale::Script::WanchoScript, "Wancho\0", "Wcho\0" }, { QLocale::Script::WesternSyriacScript, "Western Syriac\0", "Syrj\0" }, { QLocale::Script::WoleaiScript, "Woleai\0", "Wole\0" }, + { QLocale::Script::YezidiScript, "Yezidi\0", "Yezi\0" }, { QLocale::Script::YiScript, "Yi\0", "Yiii\0" }, { QLocale::Script::ZanabazarSquareScript, "Zanabazar Square\0", "Zanb\0" }, { QLocale::Script::ZawgyiScript, "Zawgyi\0", "Qaag\0" }, @@ -9918,7 +9922,7 @@ static const QLocalePrivate localeTbl[] = { { "Jan\0", "Fra\0", "Mar\0", "Apr\0", "Mej\0", "Ġun\0", "Lul\0", "Aww\0", "Set\0", "Ott\0", "Nov\0", "Diċ\0" }, { "Jannar\0", "Frar\0", "Marzu\0", "April\0", "Mejju\0", "Ġunju\0", "Lulju\0", "Awwissu\0", "Settembru\0", "Ottubru\0", "Novembru\0", "Diċembru\0" }, { "Jn\0", "Fr\0", "Mz\0", "Ap\0", "Mj\0", "Ġn\0", "Lj\0", "Aw\0", "St\0", "Ob\0", "Nv\0", "Dċ\0" }, - { "Jan\0", "Fra\0", "Mar\0", "Apr\0", "Mej\0", "Ġun\0", "Lul\0", "Aww\0", "Set\0", "Ott\0", "Nov\0", "Diċ\0" }, + { "Jan\0", "Fra\0", "Mar\0", "Apr\0", "Mej\0", "��un\0", "Lul\0", "Aww\0", "Set\0", "Ott\0", "Nov\0", "Diċ\0" }, { "Jannar\0", "Frar\0", "Marzu\0", "April\0", "Mejju\0", "Ġunju\0", "Lulju\0", "Awwissu\0", "Settembru\0", "Ottubru\0", "Novembru\0", "Diċembru\0" }, { "J\0", "F\0", "M\0", "A\0", "M\0", "Ġ\0", "L\0", "A\0", "S\0", "O\0", "N\0", "D\0" }, { "Tne\0", "Tli\0", "Erb\0", "Ħam\0", "Ġim\0", "Sib\0", "Ħad\0" }, diff --git a/src/gui/text/qfontdatabase_x11_p.h b/src/gui/text/qfontdatabase_x11_p.h index 567675bef..6842640d9 100644 --- a/src/gui/text/qfontdatabase_x11_p.h +++ b/src/gui/text/qfontdatabase_x11_p.h @@ -295,7 +295,7 @@ static const char *specialLanguagesTbl[] = { "akk-iq", // Cuneiform "phn-lb", // Phoenician "lzh-cn", // PhagsPa - 0, // Nko + "nqo-gn", // Nko "su-id", // Sundanese "lep-in", // Lepcha "sat-in", // OlChiki @@ -306,7 +306,7 @@ static const char *specialLanguagesTbl[] = { "xlc-tr", // Lycian "xcr-tr", // Carian "xld-tr", // Lydian - 0, // Cham + "cjm-vn", // Cham 0, // TaiTham "blt-vn", // TaiViet "ae-ir", // Avestan @@ -314,21 +314,21 @@ static const char *specialLanguagesTbl[] = { "smp-il", // Samaritan "lis-cn", // Lisu "bax-cm", // Bamum - 0, // Javanese + "jv-id", // Javanese "mni-in", // MeeteiMayek "arc-ir", // ImperialAramaic "ar", // OldSouthArabian "xpr-ir", // InscriptionalParthian "pal-ir", // InscriptionalPahlavi - 0, // OldTurkic + "otk-mn", // OldTurkic "bho-in", // Kaithi "bbc-id", // Batak "pka-in", // Brahmi "myz-ir", // Mandaic "ccp-bd", // Chakma "xmr-sd", // MeroiticCursive - 0, // MeroiticHieroglyphs - 0, // Miao + "xmr-sd", // MeroiticHieroglyphs + "hmd-cn", // Miao "sa-in", // Sharada "srb-in", // SoraSompeng "doi-in", // Takri @@ -368,7 +368,7 @@ static const char *specialLanguagesTbl[] = { "osa-us", // Osage "txg-cn", // Tangut "esg-in", // MasaramGondi - 0, // Nushu + "zhx-cn", // Nushu "cmg-mn", // Soyombo "cmg-mn", // ZanabazarSquare "doi-in", // Dogra @@ -382,10 +382,10 @@ static const char *specialLanguagesTbl[] = { "sa-in", // Nandinagari "mww-us", // NyiakengPuachueHmong "npp-in", // Wancho - 0, // Chorasmian - 0, // DivesAkuru - 0, // KhitanSmallScript - 0 // Yezidi + "xco-uz", // Chorasmian + "dv-mv", // DivesAkuru + "zkt-cn", // KhitanSmallScript + "ku-ge" // Yezidi }; enum { SpecialLanguageCount = sizeof(specialLanguagesTbl) / sizeof(const char *) };