Feature [feature-requests:#1315] Update to Unicode 12.1.

3 files changed, 113 insertions, 56 deletions

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 96caeaec5..c9d5da260 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -592,6 +592,10 @@
 	Optimize setting up keyword lists in lexers.
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1305/">Feature #1305</a>.
 	</li>
+	<li>
+	Updated case conversion and character categories to Unicode 12.1.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1315/">Feature #1315</a>.
+	</li>
  	<li>
 	On Win32, stop the IME candidate window moving unnecessarily and position it better.<br />
 	Stop candidate window overlapping composition text and taskbar.<br />
diff --git a/lexlib/CharacterCategory.cxx b/lexlib/CharacterCategory.cxx
index ca76325df..35f636564 100644
--- a/lexlib/CharacterCategory.cxx
+++ b/lexlib/CharacterCategory.cxx
@@ -20,7 +20,7 @@ namespace {
 
 const int catRanges[] = {
 //++Autogenerated -- start of section automatically generated
-// Created with Python 3.7.0,  Unicode 11.0.0
+// Created with Python 3.8.0,  Unicode 12.1.0
 25,
 1046,
 1073,
@@ -1003,6 +1003,7 @@ const int catRanges[] = {
 101533,
 101576,
 101917,
+102129,
 102154,
 102389,
 102404,
@@ -1116,30 +1117,16 @@ const int catRanges[] = {
 118909,
 118916,
 118973,
-119012,
-119101,
-119108,
+118980,
 119165,
-119204,
-119261,
-119428,
-119581,
-119588,
-119837,
-119844,
+119172,
 119965,
 119972,
 120029,
 120036,
-120093,
-120132,
-120221,
-120228,
 120357,
 120388,
 120453,
-120669,
-120677,
 120740,
 120797,
 120836,
@@ -1286,7 +1273,8 @@ const int catRanges[] = {
 163805,
 163852,
 163876,
-183729,
+183733,
+183761,
 183780,
 184342,
 184356,
@@ -1485,12 +1473,12 @@ const int catRanges[] = {
 236836,
 236965,
 236996,
-237126,
 237189,
 237220,
 237286,
 237317,
-237405,
+237380,
+237437,
 237569,
 238979,
 240993,
@@ -2040,9 +2028,6 @@ const int catRanges[] = {
 356053,
 357085,
 357141,
-358717,
-358741,
-360445,
 360448,
 361981,
 361985,
@@ -2245,7 +2230,7 @@ const int catRanges[] = {
 378929,
 378957,
 378993,
-379389,
+379421,
 380949,
 381789,
 381813,
@@ -2331,8 +2316,6 @@ const int catRanges[] = {
 414037,
 415274,
 415765,
-417789,
-417813,
 425988,
 636637,
 636949,
@@ -2576,7 +2559,17 @@ const int catRanges[] = {
 1373921,
 1373952,
 1373985,
-1374045,
+1374016,
+1374049,
+1374080,
+1374113,
+1374144,
+1374177,
+1374237,
+1374272,
+1374305,
+1374336,
+1374461,
 1375972,
 1376003,
 1376065,
@@ -2634,7 +2627,7 @@ const int catRanges[] = {
 1390277,
 1390406,
 1390469,
-1390502,
+1390534,
 1390641,
 1391069,
 1391075,
@@ -2711,7 +2704,7 @@ const int catRanges[] = {
 1403764,
 1403779,
 1403905,
-1404125,
+1404189,
 1404417,
 1406980,
 1408102,
@@ -3078,6 +3071,8 @@ const int catRanges[] = {
 2222634,
 2222769,
 2222941,
+2227204,
+2227965,
 2228230,
 2228261,
 2228294,
@@ -3221,7 +3216,8 @@ const int catRanges[] = {
 2263965,
 2263985,
 2264005,
-2264061,
+2264036,
+2264093,
 2265092,
 2266630,
 2266725,
@@ -3271,7 +3267,8 @@ const int catRanges[] = {
 2283013,
 2283206,
 2283237,
-2283293,
+2283268,
+2283325,
 2283528,
 2283869,
 2285572,
@@ -3301,6 +3298,20 @@ const int catRanges[] = {
 2301565,
 2301924,
 2301981,
+2307076,
+2307357,
+2307396,
+2308646,
+2308741,
+2308893,
+2308933,
+2308998,
+2309125,
+2309156,
+2309201,
+2309220,
+2309254,
+2309309,
 2310148,
 2310181,
 2310500,
@@ -3316,8 +3327,6 @@ const int catRanges[] = {
 2312934,
 2312997,
 2313092,
-2314397,
-2314436,
 2314565,
 2314982,
 2315013,
@@ -3393,6 +3402,12 @@ const int catRanges[] = {
 2350758,
 2350833,
 2350909,
+2357258,
+2357941,
+2358195,
+2358325,
+2358877,
+2359281,
 2359300,
 2388829,
 2392073,
@@ -3403,6 +3418,8 @@ const int catRanges[] = {
 2402461,
 2490372,
 2524669,
+2524698,
+2524989,
 2654212,
 2672893,
 2949124,
@@ -3440,21 +3457,28 @@ const int catRanges[] = {
 3003121,
 3003261,
 3006468,
-3008701,
+3008893,
+3008997,
 3009028,
 3009062,
-3010557,
+3010845,
 3011045,
 3011171,
 3011613,
 3013635,
-3013725,
+3013713,
+3013731,
+3013789,
 3014660,
-3210845,
+3211037,
 3211268,
 3235453,
 3538948,
 3548157,
+3549700,
+3549821,
+3550340,
+3550493,
 3550724,
 3563421,
 3637252,
@@ -3612,6 +3636,22 @@ const int catRanges[] = {
 3933373,
 3933381,
 3933565,
+3940356,
+3941821,
+3941893,
+3942115,
+3942365,
+3942408,
+3942749,
+3942852,
+3942901,
+3942941,
+3954692,
+3956101,
+3956232,
+3956573,
+3956723,
+3956765,
 3997700,
 4004029,
 4004074,
@@ -3620,7 +3660,8 @@ const int catRanges[] = {
 4005888,
 4006977,
 4008069,
-4008317,
+4008291,
+4008349,
 4008456,
 4008797,
 4008913,
@@ -3631,6 +3672,10 @@ const int catRanges[] = {
 4036115,
 4036138,
 4036285,
+4038698,
+4040149,
+4040170,
+4040669,
 4046852,
 4047005,
 4047012,
@@ -3714,7 +3759,7 @@ const int catRanges[] = {
 4071434,
 4071869,
 4071957,
-4074909,
+4074941,
 4075029,
 4076989,
 4078805,
@@ -3730,15 +3775,17 @@ const int catRanges[] = {
 4087829,
 4095860,
 4096021,
-4119229,
+4119261,
 4119573,
 4119997,
 4120085,
-4120413,
+4120445,
 4120597,
 4124317,
 4124693,
 4127549,
+4127765,
+4128157,
 4128789,
 4129181,
 4129301,
@@ -3751,24 +3798,28 @@ const int catRanges[] = {
 4134365,
 4136981,
 4137373,
-4137493,
-4139005,
-4139029,
-4140605,
+4137397,
+4140637,
 4140661,
 4140797,
 4140885,
-4140925,
-4140949,
 4142205,
-4142613,
-4142941,
-4143125,
-4143229,
-4143637,
-4145181,
+4142261,
+4142461,
+4142549,
+4143485,
+4143541,
+4147869,
 4148245,
 4148701,
+4148757,
+4148893,
+4149013,
+4149117,
+4149269,
+4149373,
+4149781,
+4149981,
 4194308,
 5561085,
 5562372,
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx
index a3092b320..da4c8ced8 100644
--- a/src/CaseConvert.cxx
+++ b/src/CaseConvert.cxx
@@ -76,6 +76,7 @@ int symmetricCaseConversionRanges[] = {
 42803,42802,31,2,
 42879,42878,5,2,
 42903,42902,10,2,
+42933,42932,6,2,
 65345,65313,26,1,
 66600,66560,40,1,
 66776,66736,36,1,
@@ -158,6 +159,7 @@ int symmetricCaseConversions[] = {
 629,415,
 637,11364,
 640,422,
+642,42949,
 643,425,
 647,42929,
 648,430,
@@ -192,6 +194,7 @@ int symmetricCaseConversions[] = {
 4351,7359,
 7545,42877,
 7549,11363,
+7566,42950,
 8017,8025,
 8019,8027,
 8021,8029,
@@ -237,9 +240,8 @@ int symmetricCaseConversions[] = {
 42892,42891,
 42897,42896,
 42899,42898,
-42933,42932,
-42935,42934,
-42937,42936,
+42900,42948,
+42947,42946,
 43859,42931,
 
 //--Autogenerated -- end of section automatically generated