From 54f8be6cc0e53bcd8b2e67d302b7cbcaed9387b9 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 13 Mar 2020 17:26:53 +0100 Subject: Update UCD to Revision 26 Include WordBreakTest.html, since a test uses sample strings from it, albeit without actually reading the file. Had to comment out more of the new tests, as at Revision 24, pending an update to harfbuzz and the text boundary detection code. Task-number: QTBUG-79631 Task-number: QTBUG-79418 Task-number: QTBUG-82747 Change-Id: I0082294b09d67ffdc6a9b5c15acf77ad3b86f65f Reviewed-by: Lars Knoll --- util/unicode/main.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'util/unicode/main.cpp') diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 9826775034..cde9f40a48 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -38,8 +38,8 @@ #include #endif -#define DATA_VERSION_S "12.1" -#define DATA_VERSION_STR "QChar::Unicode_12_1" +#define DATA_VERSION_S "13.0" +#define DATA_VERSION_STR "QChar::Unicode_13_0" static QHash age_map; @@ -72,6 +72,7 @@ static void initAgeMap() { QChar::Unicode_11_0, "11.0" }, { QChar::Unicode_12_0, "12.0" }, { QChar::Unicode_12_1, "12.1" }, // UCD Revision 24 + { QChar::Unicode_13_0, "13.0" }, // UCD Revision 26 { QChar::Unicode_Unassigned, 0 } }; AgeMap *d = ageMap; @@ -798,6 +799,11 @@ static void initScriptMap() { QChar::Script_Nandinagari, "Nandinagari" }, { QChar::Script_NyiakengPuachueHmong, "NyiakengPuachueHmong" }, { QChar::Script_Wancho, "Wancho" }, + // 13.0 + { QChar::Script_Chorasmian, "Chorasmian" }, + { QChar::Script_DivesAkuru, "DivesAkuru" }, + { QChar::Script_KhitanSmallScript, "KhitanSmallScript" }, + { QChar::Script_Yezidi, "Yezidi" }, // unhandled { QChar::Script_Unknown, 0 } @@ -3045,7 +3051,7 @@ int main(int, char **) QByteArray header = "/****************************************************************************\n" "**\n" - "** Copyright (C) 2016 The Qt Company Ltd.\n" + "** Copyright (C) 2020 The Qt Company Ltd.\n" "** Contact: https://www.qt.io/licensing/\n" "**\n" "** This file is part of the QtCore module of the Qt Toolkit.\n" -- cgit v1.2.3