diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2024-01-25 12:18:48 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2024-02-08 16:43:58 +0000 |
| commit | bfd09ec38c43551db17bd01a0ad5fb161babd840 (patch) | |
| tree | 47a83edfa0a160f8a16502d666b211960f1dbe3c /util/unicode/main.cpp | |
| parent | 25b89f2c88cdfc98bfa462949531a33f7ef50996 (diff) | |
unicode: Import version 15.1 (UCD version 32)
Add enumerator for the new Unicode version to QChar::UnicodeVersion.
Remap new line breaking classes to their Unicode 15.0 values:
* AK, AP and AS to AL,
* VI and VF to CM.
These are classes for new line breaking support for Indic scripts
that require more work.
Blacklist failing tests for now:
* tst_QUrlUts46::idnaTestV2
* tst_QTextBoundaryFinder::lineBoundariesDefault
* tst_QTextBoundaryFinder::graphemeBoundariesDefault
Regenerate the source files.
Task-number: QTBUG-121529
Change-Id: I869cc9fbaa53765d8ae6265c22cdbef9f19d05bf
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'util/unicode/main.cpp')
| -rw-r--r-- | util/unicode/main.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 269ead2d81..1f8e9fceb4 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -14,8 +14,8 @@ #include <private/qunicodetables_p.h> #endif -#define DATA_VERSION_S "15.0" -#define DATA_VERSION_STR "QChar::Unicode_15_0" +#define DATA_VERSION_S "15.1" +#define DATA_VERSION_STR "QChar::Unicode_15_1" static QHash<QByteArray, QChar::UnicodeVersion> age_map; @@ -51,6 +51,7 @@ static void initAgeMap() { QChar::Unicode_13_0, "13.0" }, // UCD Revision 26 { QChar::Unicode_14_0, "14.0" }, // UCD Revision 28 { QChar::Unicode_15_0, "15.0" }, // UCD Revision 30 + { QChar::Unicode_15_1, "15.1" }, // UCD Revision 32 { QChar::Unicode_Unassigned, 0 } }; AgeMap *d = ageMap; @@ -528,7 +529,8 @@ static void initSentenceBreak() static const char *line_break_class_string = "// see http://www.unicode.org/reports/tr14/tr14-30.html\n" - "// we don't use the XX and AI classes and map them to AL instead.\n" + "// we don't use the XX, AK, AP, AS and AI classes and map them to AL instead.\n" + "// VI and VF classes are mapped to CM.\n" "enum LineBreakClass {\n" " LineBreak_OP, LineBreak_CL, LineBreak_CP, LineBreak_QU, LineBreak_GL,\n" " LineBreak_NS, LineBreak_EX, LineBreak_SY, LineBreak_IS, LineBreak_PR,\n" @@ -612,6 +614,11 @@ static void initLineBreak() { LineBreak_EB, "EB" }, { LineBreak_EM, "EM" }, { LineBreak_ZWJ, "ZWJ" }, + { LineBreak_AL, "AK" }, + { LineBreak_AL, "AP" }, + { LineBreak_AL, "AS" }, + { LineBreak_CM, "VI" }, + { LineBreak_CM, "VF" }, { LineBreak_Unassigned, 0 } }; LineBreakList *d = breaks; |