From 2c92077debfbe17eaa29302307dcc5d257e3de87 Mon Sep 17 00:00:00 2001 From: Job Bautista Date: Thu, 23 Jun 2022 15:45:09 +0800 Subject: Issue #326 - Part 6: Regenerate Unicode data tables with the stripped-down tool --- intl/unicharutil/util/nsUnicodePropertyData.cpp | 38 +------------------------ intl/unicharutil/util/nsUnicodeScriptCodes.h | 26 +---------------- 2 files changed, 2 insertions(+), 62 deletions(-) diff --git a/intl/unicharutil/util/nsUnicodePropertyData.cpp b/intl/unicharutil/util/nsUnicodePropertyData.cpp index 6adc950e20..dccf14bcd2 100644 --- a/intl/unicharutil/util/nsUnicodePropertyData.cpp +++ b/intl/unicharutil/util/nsUnicodePropertyData.cpp @@ -11,7 +11,7 @@ */ /* - * Created on Thu Jun 23 05:27:27 2022 from UCD data files with version info: + * Created on Thu Jun 23 07:44:34 2022 from UCD data files with version info: * # Unicode Character Database @@ -29,27 +29,6 @@ This directory contains the final data files for the Unicode Character Database, for Version 10.0.0 of the Unicode Standard. -# Scripts-10.0.0.txt -# Date: 2017-03-11, 06:40:37 GMT - -# BidiMirroring-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [KW, LI] - -# BidiBrackets-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [AG, LI, KW] - -# HangulSyllableType-10.0.0.txt -# Date: 2017-02-14, 04:26:11 GMT - -# LineBreak-10.0.0.txt -# Date: 2017-03-08, 02:00:00 GMT [KW, LI] - -# EastAsianWidth-10.0.0.txt -# Date: 2017-03-08, 02:00:00 GMT [KW, LI] - -# DerivedCoreProperties-10.0.0.txt -# Date: 2017-03-19, 00:05:15 GMT - # IdentifierStatus.txt # Date: 2017-04-08, 16:13:41 GMT @@ -67,8 +46,6 @@ for the Unicode Character Database, for Version 10.0.0 of the Unicode Standard. #include #include "harfbuzz/hb.h" - - #define kCharProp2MaxPlane 16 #define kCharProp2IndexBits 9 #define kCharProp2CharBits 7 @@ -180,9 +157,6 @@ static const nsCharProps2 sCharProp2Values[96][128] = { {{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,1},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0}}, {{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{0,0},{1,0},{1,0}} }; - - - #define kFullWidthMaxPlane 0 #define kFullWidthIndexBits 10 #define kFullWidthCharBits 6 @@ -201,9 +175,6 @@ static const uint16_t sFullWidthValues[9][64] = { {0x30bf,0x30c1,0x30c4,0x30c6,0x30c8,0x30ca,0x30cb,0x30cc,0x30cd,0x30ce,0x30cf,0x30d2,0x30d5,0x30d8,0x30db,0x30de,0x30df,0x30e0,0x30e1,0x30e2,0x30e4,0x30e6,0x30e8,0x30e9,0x30ea,0x30eb,0x30ec,0x30ed,0x30ef,0x30f3,0x3099,0x309a,0x3164,0x3131,0x3132,0x3133,0x3134,0x3135,0x3136,0x3137,0x3138,0x3139,0x313a,0x313b,0x313c,0x313d,0x313e,0x313f,0x3140,0x3141,0x3142,0x3143,0x3144,0x3145,0x3146,0x3147,0x3148,0x3149,0x314a,0x314b,0x314c,0x314d,0x314e,0x0000}, {0x0000,0x0000,0x314f,0x3150,0x3151,0x3152,0x3153,0x3154,0x0000,0x0000,0x3155,0x3156,0x3157,0x3158,0x3159,0x315a,0x0000,0x0000,0x315b,0x315c,0x315d,0x315e,0x315f,0x3160,0x0000,0x0000,0x3161,0x3162,0x3163,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x2502,0x2190,0x2191,0x2192,0x2193,0x25a0,0x25cb,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000} }; - - - #define kFullWidthInverseMaxPlane 0 #define kFullWidthInverseIndexBits 10 #define kFullWidthInverseCharBits 6 @@ -226,13 +197,6 @@ static const uint16_t sFullWidthInverseValues[13][64] = { {0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,0x0068,0x0069,0x006a,0x006b,0x006c,0x006d,0x006e,0x006f,0x0070,0x0071,0x0072,0x0073,0x0074,0x0075,0x0076,0x0077,0x0078,0x0079,0x007a,0x007b,0x007c,0x007d,0x007e,0x2985,0x2986,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000}, {0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00a2,0x00a3,0x00ac,0x00af,0x00a6,0x00a5,0x20a9,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000} }; - -const uint32_t kTitleToUpper = 0x80000000; -const uint32_t kUpperToLower = 0x40000000; -const uint32_t kLowerToTitle = 0x20000000; -const uint32_t kLowerToUpper = 0x10000000; -const uint32_t kCaseMapCharMask = 0x001fffff; - /* * * * * * This file contains MACHINE-GENERATED DATA, do not edit! * * * * * */ diff --git a/intl/unicharutil/util/nsUnicodeScriptCodes.h b/intl/unicharutil/util/nsUnicodeScriptCodes.h index a1c4aa462b..b69148386e 100644 --- a/intl/unicharutil/util/nsUnicodeScriptCodes.h +++ b/intl/unicharutil/util/nsUnicodeScriptCodes.h @@ -11,7 +11,7 @@ */ /* - * Created on Thu Jun 23 05:27:27 2022 from UCD data files with version info: + * Created on Thu Jun 23 07:44:34 2022 from UCD data files with version info: * # Unicode Character Database @@ -29,27 +29,6 @@ This directory contains the final data files for the Unicode Character Database, for Version 10.0.0 of the Unicode Standard. -# Scripts-10.0.0.txt -# Date: 2017-03-11, 06:40:37 GMT - -# BidiMirroring-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [KW, LI] - -# BidiBrackets-10.0.0.txt -# Date: 2017-04-12, 17:30:00 GMT [AG, LI, KW] - -# HangulSyllableType-10.0.0.txt -# Date: 2017-02-14, 04:26:11 GMT - -# LineBreak-10.0.0.txt -# Date: 2017-03-08, 02:00:00 GMT [KW, LI] - -# EastAsianWidth-10.0.0.txt -# Date: 2017-03-08, 02:00:00 GMT [KW, LI] - -# DerivedCoreProperties-10.0.0.txt -# Date: 2017-03-19, 00:05:15 GMT - # IdentifierStatus.txt # Date: 2017-04-08, 16:13:41 GMT @@ -70,7 +49,6 @@ for the Unicode Character Database, for Version 10.0.0 of the Unicode Standard. #pragma pack(1) - struct nsCharProps2 { // Currently only 4 bits are defined here, so 4 more could be added without // affecting the storage requirements for this struct. Or we could pack two @@ -79,8 +57,6 @@ struct nsCharProps2 { unsigned char mIdType:2; }; - - #pragma pack() namespace mozilla { -- cgit v1.2.3