diff options
Diffstat (limited to 'src/corelib/text/qunicodetables_p.h')
| -rw-r--r-- | src/corelib/text/qunicodetables_p.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/corelib/text/qunicodetables_p.h b/src/corelib/text/qunicodetables_p.h index 4a2c45baa5..eabdc919cb 100644 --- a/src/corelib/text/qunicodetables_p.h +++ b/src/corelib/text/qunicodetables_p.h @@ -1,7 +1,7 @@ // Copyright (C) 2020 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: Unicode-DFS-2016 -/* This file is autogenerated from the Unicode 14.0 database. Do not edit */ +/* This file is autogenerated from the Unicode 15.1 database. Do not edit */ // // W A R N I N G @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE -#define UNICODE_DATA_VERSION QChar::Unicode_14_0 +#define UNICODE_DATA_VERSION QChar::Unicode_15_1 namespace QUnicodeTables { @@ -43,7 +43,8 @@ struct Properties { ushort joining : 3; signed short digitValue : 5; signed short mirrorDiff : 16; - ushort unicodeVersion : 8; /* 5 used */ + ushort unicodeVersion : 5; /* 5 used */ + ushort eastAsianWidth : 3; /* 3 used */ ushort nfQuickCheck : 8; #ifdef Q_OS_WASM unsigned char : 0; //wasm 64 packing trick @@ -68,6 +69,15 @@ Q_CORE_EXPORT const Properties * QT_FASTCALL properties(char16_t ucs2) noexcept; static_assert(sizeof(Properties) == 20); +enum class EastAsianWidth : unsigned int { + A, + F, + H, + N, + Na, + W, +}; + enum GraphemeBreakClass { GraphemeBreak_Any, GraphemeBreak_CR, @@ -107,10 +117,6 @@ enum WordBreakClass { WordBreak_MidNum, WordBreak_Numeric, WordBreak_ExtendNumLet, - WordBreak_E_Base, - WordBreak_E_Modifier, - WordBreak_Glue_After_Zwj, - WordBreak_E_Base_GAZ, WordBreak_WSegSpace, NumWordBreakClasses @@ -136,9 +142,11 @@ enum SentenceBreakClass { }; // see http://www.unicode.org/reports/tr14/tr14-30.html -// we don't use the XX and AI classes and map them to AL instead. +// we don't use the XX, AK, AP, AS and AI classes and map them to AL instead. +// VI and VF classes are mapped to CM. enum LineBreakClass { - LineBreak_OP, LineBreak_CL, LineBreak_CP, LineBreak_QU, LineBreak_GL, + LineBreak_OP, LineBreak_CL, LineBreak_CP, + LineBreak_QU, LineBreak_QU_Pi, LineBreak_QU_Pf, LineBreak_GL, LineBreak_NS, LineBreak_EX, LineBreak_SY, LineBreak_IS, LineBreak_PR, LineBreak_PO, LineBreak_NU, LineBreak_AL, LineBreak_HL, LineBreak_ID, LineBreak_IN, LineBreak_HY, LineBreak_BA, LineBreak_BB, LineBreak_B2, @@ -183,6 +191,10 @@ Q_CORE_EXPORT QStringView QT_FASTCALL idnaMapping(char32_t usc4) noexcept; inline QStringView idnaMapping(QChar ch) noexcept { return idnaMapping(ch.unicode()); } +Q_CORE_EXPORT EastAsianWidth QT_FASTCALL eastAsianWidth(char32_t ucs4) noexcept; +inline EastAsianWidth eastAsianWidth(QChar ch) noexcept +{ return eastAsianWidth(ch.unicode()); } + } // namespace QUnicodeTables QT_END_NAMESPACE |