aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-10-18 09:56:15 +1100
committerNeil <nyamatongwe@gmail.com>2018-10-18 09:56:15 +1100
commit2b94cc2fe6ae043129a2043b78a5032ddf275ef6 (patch)
tree7ec4a59c73f65fc1a8fc722ecc618fd5585c4949
parent4fe3150c776b2b1bbe0570e6fee9040260364f2d (diff)
downloadscintilla-mirror-2b94cc2fe6ae043129a2043b78a5032ddf275ef6.tar.gz
Updated case conversion and character categories to Unicode 11.
Fixed history by moving new items into the pending version.
-rw-r--r--doc/ScintillaHistory.html19
-rw-r--r--lexlib/CharacterCategory.cxx240
-rw-r--r--src/CaseConvert.cxx6
3 files changed, 195 insertions, 70 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 758f1d839..4daecdfbf 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -556,10 +556,21 @@
can be a significant performance cost.
</li>
<li>
+ Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
+ still remaining responsive.
+ </li>
+ <li>
+ Updated case conversion and character categories to Unicode 11.
+ </li>
+ <li>
Fixed a crash on Cocoa in bidirectional mode where some patterns of invalid UTF-8
caused failures to create Unicode strings.
</li>
<li>
+ SCI_MARKERADD returns -1 for invalid lines as documented instead of 0.
+ <a href="https://sourceforge.net/p/scintilla/bugs/2051/">Bug #2051</a>.
+ </li>
+ <li>
Improve performance of text insertion when Unicode line indexing off.
</li>
</ul>
@@ -571,10 +582,6 @@
Released 2 October 2018.
</li>
<li>
- Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
- still remaining responsive.
- </li>
- <li>
C++ lexer fixes evaluation of "#elif".
<a href="https://sourceforge.net/p/scintilla/bugs/2045/">Bug #2045</a>.
</li>
@@ -582,10 +589,6 @@
Markdown lexer fixes highlighting of non-ASCII characters in links.
</li>
<li>
- SCI_MARKERADD returns -1 for invalid lines as documented instead of 0.
- <a href="https://sourceforge.net/p/scintilla/bugs/2051/">Bug #2051</a>.
- </li>
- <li>
SciTE on Win32 drops menukey feature, makes Del key work again in find and replace strips
and disables F5 while command running.
<a href="https://sourceforge.net/p/scintilla/bugs/2044/">Bug #2044</a>.
diff --git a/lexlib/CharacterCategory.cxx b/lexlib/CharacterCategory.cxx
index 1595a7192..bc2fa2336 100644
--- a/lexlib/CharacterCategory.cxx
+++ b/lexlib/CharacterCategory.cxx
@@ -19,7 +19,7 @@ namespace {
const int catRanges[] = {
//++Autogenerated -- start of section automatically generated
-// Created with Python 3.6.1, Unicode 9.0.0
+// Created with Python 3.7.0, Unicode 11.0.0
25,
1046,
1073,
@@ -651,9 +651,7 @@ const int catRanges[] = {
43773,
43811,
43857,
-44061,
-44065,
-45341,
+44033,
45361,
45388,
45437,
@@ -672,7 +670,7 @@ const int catRanges[] = {
47389,
47620,
48509,
-48644,
+48612,
48753,
48829,
49178,
@@ -730,6 +728,8 @@ const int catRanges[] = {
65265,
65347,
65405,
+65445,
+65491,
65540,
66245,
66371,
@@ -746,11 +746,13 @@ const int catRanges[] = {
68509,
68561,
68605,
+68612,
+68989,
70660,
71357,
71364,
71645,
-72325,
+72293,
72794,
72805,
73830,
@@ -812,7 +814,10 @@ const int catRanges[] = {
81546,
81749,
81779,
-81821,
+81796,
+81841,
+81861,
+81917,
81957,
82022,
82077,
@@ -849,7 +854,8 @@ const int catRanges[] = {
85509,
85572,
85669,
-85725,
+85713,
+85757,
86053,
86118,
86173,
@@ -886,7 +892,8 @@ const int catRanges[] = {
89651,
89693,
89892,
-89949,
+89925,
+90141,
90149,
90182,
90269,
@@ -969,7 +976,7 @@ const int catRanges[] = {
98173,
98309,
98342,
-98461,
+98437,
98468,
98749,
98756,
@@ -1000,7 +1007,7 @@ const int catRanges[] = {
102404,
102437,
102470,
-102557,
+102545,
102564,
102845,
102852,
@@ -1034,7 +1041,7 @@ const int catRanges[] = {
106013,
106020,
106109,
-106533,
+106501,
106566,
106653,
106660,
@@ -1042,7 +1049,7 @@ const int catRanges[] = {
106948,
107069,
107076,
-108413,
+108389,
108452,
108486,
108581,
@@ -1229,10 +1236,11 @@ const int catRanges[] = {
137501,
137632,
137693,
-137732,
+137729,
139121,
139139,
-139172,
+139169,
+139268,
149821,
149828,
149981,
@@ -1337,7 +1345,7 @@ const int catRanges[] = {
197636,
198755,
198788,
-200477,
+200509,
200708,
200869,
200932,
@@ -1463,6 +1471,9 @@ const int catRanges[] = {
233425,
233473,
233789,
+233984,
+235389,
+235424,
235537,
235805,
236037,
@@ -1476,7 +1487,7 @@ const int catRanges[] = {
237126,
237189,
237220,
-237309,
+237286,
237317,
237405,
237569,
@@ -1486,7 +1497,7 @@ const int catRanges[] = {
241441,
242531,
243717,
-245469,
+245597,
245605,
245760,
245793,
@@ -1849,7 +1860,7 @@ const int catRanges[] = {
266755,
267197,
267283,
-268285,
+268317,
268805,
269223,
269349,
@@ -1940,8 +1951,6 @@ const int catRanges[] = {
292501,
293778,
293973,
-294909,
-294933,
296189,
296981,
297341,
@@ -2030,13 +2039,9 @@ const int catRanges[] = {
356053,
357085,
357141,
-358237,
-358325,
358717,
358741,
-359005,
-359829,
-359965,
+360445,
360448,
361981,
361985,
@@ -2239,7 +2244,7 @@ const int catRanges[] = {
378929,
378957,
378993,
-379069,
+379389,
380949,
381789,
381813,
@@ -2302,7 +2307,7 @@ const int catRanges[] = {
401380,
401437,
401572,
-402909,
+402973,
402980,
406013,
406037,
@@ -2331,7 +2336,7 @@ const int catRanges[] = {
636637,
636949,
638980,
-1309405,
+1310237,
1310724,
1311395,
1311428,
@@ -2563,12 +2568,14 @@ const int catRanges[] = {
1373440,
1373473,
1373504,
-1373693,
+1373665,
1373696,
1373857,
1373888,
1373921,
-1373981,
+1373952,
+1373985,
+1374045,
1375972,
1376003,
1376065,
@@ -2606,7 +2613,7 @@ const int catRanges[] = {
1384292,
1384337,
1384356,
-1384413,
+1384421,
1384456,
1384772,
1385669,
@@ -2919,7 +2926,7 @@ const int catRanges[] = {
2121732,
2122762,
2122909,
-2123268,
+2123172,
2123817,
2123844,
2124105,
@@ -3010,12 +3017,12 @@ const int catRanges[] = {
2179748,
2179869,
2179876,
-2180765,
+2180829,
2180869,
2180989,
2181093,
2181130,
-2181405,
+2181437,
2181649,
2181949,
2182148,
@@ -3054,9 +3061,22 @@ const int catRanges[] = {
2201601,
2203261,
2203466,
-2203677,
+2203652,
+2204805,
+2204957,
+2205192,
+2205533,
2214922,
2215933,
+2220036,
+2220970,
+2221284,
+2221341,
+2221572,
+2222277,
+2222634,
+2222769,
+2222941,
2228230,
2228261,
2228294,
@@ -3078,6 +3098,8 @@ const int catRanges[] = {
2234298,
2234321,
2234461,
+2234810,
+2234845,
2234884,
2235709,
2235912,
@@ -3090,7 +3112,9 @@ const int catRanges[] = {
2238141,
2238152,
2238481,
-2238621,
+2238596,
+2238630,
+2238717,
2238980,
2240101,
2240145,
@@ -3104,7 +3128,7 @@ const int catRanges[] = {
2242534,
2242596,
2242737,
-2242885,
+2242853,
2242993,
2243037,
2243080,
@@ -3160,7 +3184,7 @@ const int catRanges[] = {
2254493,
2254500,
2254685,
-2254725,
+2254693,
2254756,
2254790,
2254853,
@@ -3195,7 +3219,8 @@ const int catRanges[] = {
2263921,
2263965,
2263985,
-2264029,
+2264005,
+2264061,
2265092,
2266630,
2266725,
@@ -3249,7 +3274,7 @@ const int catRanges[] = {
2283528,
2283869,
2285572,
-2286429,
+2286461,
2286501,
2286598,
2286661,
@@ -3261,6 +3286,13 @@ const int catRanges[] = {
2287505,
2287605,
2287645,
+2293764,
+2295174,
+2295269,
+2295558,
+2295589,
+2295665,
+2295709,
2298880,
2299905,
2300936,
@@ -3268,6 +3300,30 @@ const int catRanges[] = {
2301565,
2301924,
2301981,
+2310148,
+2310181,
+2310500,
+2311781,
+2311974,
+2312004,
+2312037,
+2312177,
+2312421,
+2312477,
+2312708,
+2312741,
+2312934,
+2312997,
+2313092,
+2314397,
+2314436,
+2314565,
+2314982,
+2315013,
+2315089,
+2315172,
+2315217,
+2315389,
2316292,
2318141,
2326532,
@@ -3297,6 +3353,45 @@ const int catRanges[] = {
2332294,
2332325,
2332413,
+2334724,
+2334973,
+2334980,
+2335069,
+2335076,
+2336293,
+2336509,
+2336581,
+2336637,
+2336645,
+2336733,
+2336741,
+2336964,
+2336997,
+2337053,
+2337288,
+2337629,
+2337796,
+2338013,
+2338020,
+2338109,
+2338116,
+2339142,
+2339325,
+2339333,
+2339421,
+2339430,
+2339493,
+2339526,
+2339557,
+2339588,
+2339645,
+2339848,
+2340189,
+2350084,
+2350693,
+2350758,
+2350833,
+2350909,
2359300,
2388829,
2392073,
@@ -3338,6 +3433,11 @@ const int catRanges[] = {
2977565,
2977700,
2978333,
+3000320,
+3001345,
+3002378,
+3003121,
+3003261,
3006468,
3008701,
3009028,
@@ -3347,13 +3447,15 @@ const int catRanges[] = {
3011171,
3011613,
3013635,
-3013693,
+3013725,
3014660,
-3210685,
+3210845,
3211268,
3235453,
3538948,
-3539037,
+3548157,
+3550724,
+3563421,
3637252,
3640701,
3640836,
@@ -3388,10 +3490,12 @@ const int catRanges[] = {
3819589,
3819701,
3819741,
+3824650,
+3825309,
3825685,
3828477,
3828746,
-3829341,
+3829565,
3833856,
3834689,
3835520,
@@ -3520,6 +3624,12 @@ const int catRanges[] = {
4008797,
4008913,
4008989,
+4034090,
+4035989,
+4036010,
+4036115,
+4036138,
+4036285,
4046852,
4047005,
4047012,
@@ -3603,8 +3713,6 @@ const int catRanges[] = {
4071434,
4071869,
4071957,
-4072957,
-4072981,
4074909,
4075029,
4076989,
@@ -3616,18 +3724,20 @@ const int catRanges[] = {
4081981,
4082197,
4082269,
+4082709,
+4082909,
4087829,
4095860,
4096021,
-4119165,
+4119229,
4119573,
4119997,
4120085,
-4120317,
+4120413,
4120597,
4124317,
4124693,
-4127421,
+4127549,
4128789,
4129181,
4129301,
@@ -3638,22 +3748,26 @@ const int catRanges[] = {
4133149,
4133397,
4134365,
+4136981,
+4137373,
4137493,
-4137981,
-4138005,
-4138269,
-4138517,
-4138557,
-4138613,
4139005,
4139029,
-4139421,
-4139541,
-4140029,
-4141077,
-4141661,
+4140605,
+4140661,
+4140797,
+4140885,
+4140925,
+4140949,
+4142205,
+4142613,
+4142941,
4143125,
-4143165,
+4143229,
+4143637,
+4145181,
+4148245,
+4148701,
4194308,
5561085,
5562372,
@@ -3662,6 +3776,8 @@ const int catRanges[] = {
5702621,
5702660,
5887069,
+5887492,
+6126653,
6225924,
6243293,
29360186,
diff --git a/src/CaseConvert.cxx b/src/CaseConvert.cxx
index da3be5ecd..a3391a7e2 100644
--- a/src/CaseConvert.cxx
+++ b/src/CaseConvert.cxx
@@ -56,6 +56,7 @@ int symmetricCaseConversionRanges[] = {
1218,1217,7,2,
1233,1232,48,2,
1377,1329,38,1,
+4304,7312,43,1,
7681,7680,75,2,
7841,7840,48,2,
7936,7944,8,1,
@@ -80,6 +81,7 @@ int symmetricCaseConversionRanges[] = {
66776,66736,36,1,
68800,68736,51,1,
71872,71840,32,1,
+93792,93760,32,1,
125218,125184,34,1,
//--Autogenerated -- end of section automatically generated
@@ -185,6 +187,9 @@ int symmetricCaseConversions[] = {
1016,1015,
1019,1018,
1231,1216,
+4349,7357,
+4350,7358,
+4351,7359,
7545,42877,
7549,11363,
8017,8025,
@@ -234,6 +239,7 @@ int symmetricCaseConversions[] = {
42899,42898,
42933,42932,
42935,42934,
+42937,42936,
43859,42931,
//--Autogenerated -- end of section automatically generated