rtl: apply Inoussa patch to Unicode manager files (issue #0022909)

git-svn-id: trunk@24017 -
This commit is contained in:
paul 2013-03-27 00:55:37 +00:00
parent 7dfe1301c3
commit c093297341
22 changed files with 94764 additions and 44890 deletions

2
.gitattributes vendored
View File

@ -8406,8 +8406,10 @@ rtl/objpas/collations/collation_ru.pas svneol=native#text/pascal
rtl/objpas/collations/collation_ru_be.inc svneol=native#text/pascal
rtl/objpas/collations/collation_ru_le.inc svneol=native#text/pascal
rtl/objpas/collations/collation_sv.pas svneol=native#text/pascal
rtl/objpas/collations/collation_sv_be.inc svneol=native#text/pascal
rtl/objpas/collations/collation_sv_le.inc svneol=native#text/pascal
rtl/objpas/collations/collation_zh.pas svneol=native#text/pascal
rtl/objpas/collations/collation_zh_be.inc svneol=native#text/pascal
rtl/objpas/collations/collation_zh_le.inc svneol=native#text/pascal
rtl/objpas/convutil.inc svneol=native#text/plain
rtl/objpas/convutil.pp svneol=native#text/plain

View File

@ -135,8 +135,11 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
);
{$include collation_es_le.inc}
{$ifdef FPC_LITTLE_ENDIAN}
{$include collation_es_le.inc}
{$else FPC_LITTLE_ENDIAN}
{$include collation_es_be.inc}
{$endif FPC_LITTLE_ENDIAN}
var
CLDR_Collation : TUCA_DataBook = (
Base : nil;

View File

@ -1927,17 +1927,17 @@ const
const
UCA_PROPS : array[0..677] of Byte = (
33,1,0,45,0,23,79,0,5,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,17,0,0,18,2,23,80,0,1,23,80,0,0,0,0,0,3,3,17,1,0,33,0,23,79,0,0,23,79,0,0,0,0,
17,0,0,18,2,23,80,0,0,23,80,0,0,0,0,0,3,3,57,0,0,45,0,23,79,0,6,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,0,0,0,97,0,3,22,230,0,32,0,3,22,230,0,
32,0,9,49,0,0,39,0,23,79,0,6,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,2,23,79,0,0,0,0,0,0,0,
97,0,3,22,230,0,32,0,3,17,0,0,15,0,23,79,0,2,23,79,0,0,0,0,33,0,0,27,0,23,79,0,4,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,41,0,0,33,0,23,79,0,6,
23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,0,0,0,97,0,3,25,0,0,21,0,23,79,0,2,23,79,0,0,0,0,0,0,0,97,0,3,33,0,0,27,0,23,79,0,6,23,79,0,0,0,0,
0,0,0,97,0,3,22,230,0,32,0,3,17,0,0,15,0,23,79,0,1,23,79,0,0,0,0,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,
79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,
0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,
97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,
32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,
27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,33,0,0,27,0,23,79,0,3,
4,1,0,45,193,23,79,0,5,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,2,0,0,18,195,23,80,0,1,23,80,0,0,0,0,0,3,3,2,1,0,33,193,23,79,0,0,23,79,0,0,0,0,
2,0,0,18,195,23,80,0,0,23,80,0,0,0,0,0,3,3,7,0,0,45,193,23,79,0,6,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,0,0,0,97,0,3,22,230,0,32,0,3,22,230,0,
32,0,9,6,0,0,39,193,23,79,0,6,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,2,23,79,0,0,0,0,0,0,0,
97,0,3,22,230,0,32,0,3,2,0,0,15,193,23,79,0,2,23,79,0,0,0,0,4,0,0,27,193,23,79,0,4,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,5,0,0,33,193,23,79,0,6,
23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,0,0,0,97,0,3,3,0,0,21,193,23,79,0,2,23,79,0,0,0,0,0,0,0,97,0,3,4,0,0,27,193,23,79,0,6,23,79,0,0,0,0,
0,0,0,97,0,3,22,230,0,32,0,3,2,0,0,15,193,23,79,0,1,23,79,0,0,0,0,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,
79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,
0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,
97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,
32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,
27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3,4,0,0,27,193,23,79,0,3,
23,79,0,0,0,0,0,0,0,97,0,3,22,230,0,32,0,3
);

View File

@ -1927,17 +1927,17 @@ const
const
UCA_PROPS : array[0..677] of Byte = (
33,1,45,0,0,79,23,0,5,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,17,0,18,0,2,80,23,0,1,80,23,0,0,0,0,3,3,0,17,1,33,0,0,79,23,0,0,79,23,0,0,0,0,
17,0,18,0,2,80,23,0,0,80,23,0,0,0,0,3,3,0,57,0,45,0,0,79,23,0,6,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,0,0,97,0,3,0,230,22,32,0,3,0,230,22,32,
0,9,0,49,0,39,0,0,79,23,0,6,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,2,79,23,0,0,0,0,0,0,97,
0,3,0,230,22,32,0,3,0,17,0,15,0,0,79,23,0,2,79,23,0,0,0,0,33,0,27,0,0,79,23,0,4,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,41,0,33,0,0,79,23,0,6,
79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,0,0,97,0,3,0,25,0,21,0,0,79,23,0,2,79,23,0,0,0,0,0,0,97,0,3,0,33,0,27,0,0,79,23,0,6,79,23,0,0,0,0,
0,0,97,0,3,0,230,22,32,0,3,0,17,0,15,0,0,79,23,0,1,79,23,0,0,0,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,
23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,
0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,
0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,
0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,
0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,33,0,27,0,0,79,23,0,3,
4,1,45,0,193,79,23,0,5,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,2,0,18,0,195,80,23,0,1,80,23,0,0,0,0,3,3,0,2,1,33,0,193,79,23,0,0,79,23,0,0,0,0,
2,0,18,0,195,80,23,0,0,80,23,0,0,0,0,3,3,0,7,0,45,0,193,79,23,0,6,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,0,0,97,0,3,0,230,22,32,0,3,0,230,22,32,
0,9,0,6,0,39,0,193,79,23,0,6,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,2,79,23,0,0,0,0,0,0,97,
0,3,0,230,22,32,0,3,0,2,0,15,0,193,79,23,0,2,79,23,0,0,0,0,4,0,27,0,193,79,23,0,4,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,5,0,33,0,193,79,23,0,6,
79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,0,0,97,0,3,0,3,0,21,0,193,79,23,0,2,79,23,0,0,0,0,0,0,97,0,3,0,4,0,27,0,193,79,23,0,6,79,23,0,0,0,0,
0,0,97,0,3,0,230,22,32,0,3,0,2,0,15,0,193,79,23,0,1,79,23,0,0,0,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,
23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,
0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,
0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,
0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,
0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0,4,0,27,0,193,79,23,0,3,
79,23,0,0,0,0,0,0,97,0,3,0,230,22,32,0,3,0
);

View File

@ -45,26 +45,26 @@ const
BACKWARDS_1 = False;
BACKWARDS_2 = False;
BACKWARDS_3 = False;
PROP_COUNT = 114058;
PROP_COUNT = 110185;
const
UCA_TABLE_1 : array[0..255] of Byte = (
0,1,2,3,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,4,1,1,
5,6,1,1,7,1,1,1,1,1,1,1,8,1,1,1,
9,10,11,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,12,13,
14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,
30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,
46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,
62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,
78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,94,1,1,95,96
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,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,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,
5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,
21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,
37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,
53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,
69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85
);
const
@ -72,7 +72,7 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,2,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -135,8 +135,11 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
);
{$include collation_ja_le.inc}
{$ifdef FPC_LITTLE_ENDIAN}
{$include collation_ja_le.inc}
{$else FPC_LITTLE_ENDIAN}
{$include collation_ja_be.inc}
{$endif FPC_LITTLE_ENDIAN}
var
CLDR_Collation : TUCA_DataBook = (
Base : nil;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -135,8 +135,11 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
);
{$include collation_ko_le.inc}
{$ifdef FPC_LITTLE_ENDIAN}
{$include collation_ko_le.inc}
{$else FPC_LITTLE_ENDIAN}
{$include collation_ko_be.inc}
{$endif FPC_LITTLE_ENDIAN}
var
CLDR_Collation : TUCA_DataBook = (
Base : nil;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -135,8 +135,11 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
);
{$include collation_ru_le.inc}
{$ifdef FPC_LITTLE_ENDIAN}
{$include collation_ru_le.inc}
{$else FPC_LITTLE_ENDIAN}
{$include collation_ru_be.inc}
{$endif FPC_LITTLE_ENDIAN}
var
CLDR_Collation : TUCA_DataBook = (
Base : nil;

View File

@ -903,20 +903,20 @@ const
const
UCA_PROPS : array[0..884] of Byte = (
1,1,0,23,8,17,0,0,18,2,26,27,0,2,26,27,0,0,0,0,0,3,8,1,2,0,41,8,17,0,0,18,2,25,146,0,1,25,146,0,0,0,0,0,3,6,17,0,0,18,2,25,146,0,2,25,147,0,0,0,
0,0,3,8,1,2,0,41,8,17,0,0,18,2,25,209,0,1,25,209,0,0,0,0,0,3,1,17,0,0,18,2,25,209,0,1,25,209,0,0,0,0,0,3,65,1,1,0,23,8,17,0,0,18,2,25,218,0,1,25,
218,0,0,0,0,0,3,6,1,1,0,23,8,17,0,0,18,2,25,234,0,1,25,234,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,25,249,0,1,25,249,0,0,0,0,0,3,8,1,2,0,41,8,17,
0,0,18,2,26,178,0,1,26,178,0,0,0,0,0,3,1,17,0,0,18,2,26,178,0,1,26,178,0,0,0,0,0,3,65,1,1,0,23,8,17,0,0,18,2,26,120,0,1,26,120,0,0,0,0,0,3,8,1,3,
0,59,8,17,0,0,18,2,26,186,0,1,26,186,0,0,0,0,0,3,6,17,0,0,18,2,26,186,0,2,26,187,0,0,0,0,0,3,8,17,0,0,18,2,26,186,0,3,26,188,0,0,0,0,0,3,11,1,1,0,
23,8,17,0,0,18,2,27,17,0,1,27,17,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,27,64,0,1,27,64,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,27,84,0,1,27,84,0,
0,0,0,0,3,8,1,2,0,41,8,17,0,0,18,2,25,146,0,0,25,146,0,0,0,0,0,3,6,17,0,0,18,2,25,146,0,1,25,147,0,0,0,0,0,3,8,1,2,0,41,8,17,0,0,18,2,25,209,0,
0,25,209,0,0,0,0,0,3,1,17,0,0,18,2,25,209,0,0,25,209,0,0,0,0,0,3,65,1,1,0,23,8,17,0,0,18,2,25,218,0,0,25,218,0,0,0,0,0,3,6,1,1,0,23,8,17,0,0,18,
2,25,234,0,0,25,234,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,25,249,0,0,25,249,0,0,0,0,0,3,8,1,2,0,41,8,17,0,0,18,2,26,178,0,0,26,178,0,0,0,0,0,3,1,
17,0,0,18,2,26,178,0,0,26,178,0,0,0,0,0,3,65,1,1,0,23,8,17,0,0,18,2,26,120,0,0,26,120,0,0,0,0,0,3,8,1,3,0,59,8,17,0,0,18,2,26,186,0,0,26,186,0,0,0,
0,0,3,6,17,0,0,18,2,26,186,0,1,26,187,0,0,0,0,0,3,8,17,0,0,18,2,26,186,0,2,26,188,0,0,0,0,0,3,11,1,1,0,23,8,17,0,0,18,2,27,17,0,0,27,17,0,0,0,0,
0,3,8,1,1,0,23,8,17,0,0,18,2,27,64,0,0,27,64,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,27,84,0,0,27,84,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,26,
27,0,0,26,27,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,27,135,0,1,27,135,0,0,0,0,0,3,15,1,1,0,23,8,17,0,0,18,2,27,135,0,0,27,135,0,0,0,0,0,3,15,1,1,
0,23,8,17,0,0,18,2,25,146,0,3,25,148,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,25,146,0,2,25,148,0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,26,120,0,2,26,121,
0,0,0,0,0,3,8,1,1,0,23,8,17,0,0,18,2,26,120,0,1,26,121,0,0,0,0,0,3,8,17,0,0,15,0,26,27,0,1,26,27,0,0,0,0
0,1,0,23,9,2,0,0,18,195,26,27,0,2,26,27,0,0,0,0,0,3,8,0,2,0,41,9,2,0,0,18,195,25,146,0,1,25,146,0,0,0,0,0,3,6,2,0,0,18,195,25,146,0,2,25,147,0,0,0,
0,0,3,8,0,2,0,41,9,2,0,0,18,195,25,209,0,1,25,209,0,0,0,0,0,3,1,2,0,0,18,195,25,209,0,1,25,209,0,0,0,0,0,3,65,0,1,0,23,9,2,0,0,18,195,25,218,0,1,25,
218,0,0,0,0,0,3,6,0,1,0,23,9,2,0,0,18,195,25,234,0,1,25,234,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,25,249,0,1,25,249,0,0,0,0,0,3,8,0,2,0,41,9,2,
0,0,18,195,26,178,0,1,26,178,0,0,0,0,0,3,1,2,0,0,18,195,26,178,0,1,26,178,0,0,0,0,0,3,65,0,1,0,23,9,2,0,0,18,195,26,120,0,1,26,120,0,0,0,0,0,3,8,0,3,
0,59,9,2,0,0,18,195,26,186,0,1,26,186,0,0,0,0,0,3,6,2,0,0,18,195,26,186,0,2,26,187,0,0,0,0,0,3,8,2,0,0,18,195,26,186,0,3,26,188,0,0,0,0,0,3,11,0,1,0,
23,9,2,0,0,18,195,27,17,0,1,27,17,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,27,64,0,1,27,64,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,27,84,0,1,27,84,0,
0,0,0,0,3,8,0,2,0,41,9,2,0,0,18,195,25,146,0,0,25,146,0,0,0,0,0,3,6,2,0,0,18,195,25,146,0,1,25,147,0,0,0,0,0,3,8,0,2,0,41,9,2,0,0,18,195,25,209,0,
0,25,209,0,0,0,0,0,3,1,2,0,0,18,195,25,209,0,0,25,209,0,0,0,0,0,3,65,0,1,0,23,9,2,0,0,18,195,25,218,0,0,25,218,0,0,0,0,0,3,6,0,1,0,23,9,2,0,0,18,
195,25,234,0,0,25,234,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,25,249,0,0,25,249,0,0,0,0,0,3,8,0,2,0,41,9,2,0,0,18,195,26,178,0,0,26,178,0,0,0,0,0,3,1,
2,0,0,18,195,26,178,0,0,26,178,0,0,0,0,0,3,65,0,1,0,23,9,2,0,0,18,195,26,120,0,0,26,120,0,0,0,0,0,3,8,0,3,0,59,9,2,0,0,18,195,26,186,0,0,26,186,0,0,0,
0,0,3,6,2,0,0,18,195,26,186,0,1,26,187,0,0,0,0,0,3,8,2,0,0,18,195,26,186,0,2,26,188,0,0,0,0,0,3,11,0,1,0,23,9,2,0,0,18,195,27,17,0,0,27,17,0,0,0,0,
0,3,8,0,1,0,23,9,2,0,0,18,195,27,64,0,0,27,64,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,27,84,0,0,27,84,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,26,
27,0,0,26,27,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,27,135,0,1,27,135,0,0,0,0,0,3,15,0,1,0,23,9,2,0,0,18,195,27,135,0,0,27,135,0,0,0,0,0,3,15,0,1,
0,23,9,2,0,0,18,195,25,146,0,3,25,148,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,25,146,0,2,25,148,0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,26,120,0,2,26,121,
0,0,0,0,0,3,8,0,1,0,23,9,2,0,0,18,195,26,120,0,1,26,121,0,0,0,0,0,3,8,2,0,0,15,193,26,27,0,1,26,27,0,0,0,0
);

View File

@ -903,20 +903,20 @@ const
const
UCA_PROPS : array[0..884] of Byte = (
1,1,23,0,8,17,0,18,0,2,27,26,0,2,27,26,0,0,0,0,8,3,0,1,2,41,0,8,17,0,18,0,2,146,25,0,1,146,25,0,0,0,0,6,3,0,17,0,18,0,2,146,25,0,2,147,25,0,0,0,
0,8,3,0,1,2,41,0,8,17,0,18,0,2,209,25,0,1,209,25,0,0,0,0,1,3,0,17,0,18,0,2,209,25,0,1,209,25,0,0,0,0,65,3,0,1,1,23,0,8,17,0,18,0,2,218,25,0,1,218,
25,0,0,0,0,6,3,0,1,1,23,0,8,17,0,18,0,2,234,25,0,1,234,25,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,249,25,0,1,249,25,0,0,0,0,8,3,0,1,2,41,0,8,17,
0,18,0,2,178,26,0,1,178,26,0,0,0,0,1,3,0,17,0,18,0,2,178,26,0,1,178,26,0,0,0,0,65,3,0,1,1,23,0,8,17,0,18,0,2,120,26,0,1,120,26,0,0,0,0,8,3,0,1,3,
59,0,8,17,0,18,0,2,186,26,0,1,186,26,0,0,0,0,6,3,0,17,0,18,0,2,186,26,0,2,187,26,0,0,0,0,8,3,0,17,0,18,0,2,186,26,0,3,188,26,0,0,0,0,11,3,0,1,1,23,
0,8,17,0,18,0,2,17,27,0,1,17,27,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,64,27,0,1,64,27,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,84,27,0,1,84,27,0,
0,0,0,8,3,0,1,2,41,0,8,17,0,18,0,2,146,25,0,0,146,25,0,0,0,0,6,3,0,17,0,18,0,2,146,25,0,1,147,25,0,0,0,0,8,3,0,1,2,41,0,8,17,0,18,0,2,209,25,0,
0,209,25,0,0,0,0,1,3,0,17,0,18,0,2,209,25,0,0,209,25,0,0,0,0,65,3,0,1,1,23,0,8,17,0,18,0,2,218,25,0,0,218,25,0,0,0,0,6,3,0,1,1,23,0,8,17,0,18,0,
2,234,25,0,0,234,25,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,249,25,0,0,249,25,0,0,0,0,8,3,0,1,2,41,0,8,17,0,18,0,2,178,26,0,0,178,26,0,0,0,0,1,3,0,
17,0,18,0,2,178,26,0,0,178,26,0,0,0,0,65,3,0,1,1,23,0,8,17,0,18,0,2,120,26,0,0,120,26,0,0,0,0,8,3,0,1,3,59,0,8,17,0,18,0,2,186,26,0,0,186,26,0,0,0,
0,6,3,0,17,0,18,0,2,186,26,0,1,187,26,0,0,0,0,8,3,0,17,0,18,0,2,186,26,0,2,188,26,0,0,0,0,11,3,0,1,1,23,0,8,17,0,18,0,2,17,27,0,0,17,27,0,0,0,0,
8,3,0,1,1,23,0,8,17,0,18,0,2,64,27,0,0,64,27,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,84,27,0,0,84,27,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,27,
26,0,0,27,26,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,135,27,0,1,135,27,0,0,0,0,15,3,0,1,1,23,0,8,17,0,18,0,2,135,27,0,0,135,27,0,0,0,0,15,3,0,1,1,
23,0,8,17,0,18,0,2,146,25,0,3,148,25,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,146,25,0,2,148,25,0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,120,26,0,2,121,26,
0,0,0,0,8,3,0,1,1,23,0,8,17,0,18,0,2,120,26,0,1,121,26,0,0,0,0,8,3,0,17,0,15,0,0,27,26,0,1,27,26,0,0,0,0
0,1,23,0,9,2,0,18,0,195,27,26,0,2,27,26,0,0,0,0,8,3,0,0,2,41,0,9,2,0,18,0,195,146,25,0,1,146,25,0,0,0,0,6,3,0,2,0,18,0,195,146,25,0,2,147,25,0,0,0,
0,8,3,0,0,2,41,0,9,2,0,18,0,195,209,25,0,1,209,25,0,0,0,0,1,3,0,2,0,18,0,195,209,25,0,1,209,25,0,0,0,0,65,3,0,0,1,23,0,9,2,0,18,0,195,218,25,0,1,218,
25,0,0,0,0,6,3,0,0,1,23,0,9,2,0,18,0,195,234,25,0,1,234,25,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,249,25,0,1,249,25,0,0,0,0,8,3,0,0,2,41,0,9,2,
0,18,0,195,178,26,0,1,178,26,0,0,0,0,1,3,0,2,0,18,0,195,178,26,0,1,178,26,0,0,0,0,65,3,0,0,1,23,0,9,2,0,18,0,195,120,26,0,1,120,26,0,0,0,0,8,3,0,0,3,
59,0,9,2,0,18,0,195,186,26,0,1,186,26,0,0,0,0,6,3,0,2,0,18,0,195,186,26,0,2,187,26,0,0,0,0,8,3,0,2,0,18,0,195,186,26,0,3,188,26,0,0,0,0,11,3,0,0,1,23,
0,9,2,0,18,0,195,17,27,0,1,17,27,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,64,27,0,1,64,27,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,84,27,0,1,84,27,0,
0,0,0,8,3,0,0,2,41,0,9,2,0,18,0,195,146,25,0,0,146,25,0,0,0,0,6,3,0,2,0,18,0,195,146,25,0,1,147,25,0,0,0,0,8,3,0,0,2,41,0,9,2,0,18,0,195,209,25,0,
0,209,25,0,0,0,0,1,3,0,2,0,18,0,195,209,25,0,0,209,25,0,0,0,0,65,3,0,0,1,23,0,9,2,0,18,0,195,218,25,0,0,218,25,0,0,0,0,6,3,0,0,1,23,0,9,2,0,18,0,
195,234,25,0,0,234,25,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,249,25,0,0,249,25,0,0,0,0,8,3,0,0,2,41,0,9,2,0,18,0,195,178,26,0,0,178,26,0,0,0,0,1,3,0,
2,0,18,0,195,178,26,0,0,178,26,0,0,0,0,65,3,0,0,1,23,0,9,2,0,18,0,195,120,26,0,0,120,26,0,0,0,0,8,3,0,0,3,59,0,9,2,0,18,0,195,186,26,0,0,186,26,0,0,0,
0,6,3,0,2,0,18,0,195,186,26,0,1,187,26,0,0,0,0,8,3,0,2,0,18,0,195,186,26,0,2,188,26,0,0,0,0,11,3,0,0,1,23,0,9,2,0,18,0,195,17,27,0,0,17,27,0,0,0,0,
8,3,0,0,1,23,0,9,2,0,18,0,195,64,27,0,0,64,27,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,84,27,0,0,84,27,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,27,
26,0,0,27,26,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,135,27,0,1,135,27,0,0,0,0,15,3,0,0,1,23,0,9,2,0,18,0,195,135,27,0,0,135,27,0,0,0,0,15,3,0,0,1,
23,0,9,2,0,18,0,195,146,25,0,3,148,25,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,146,25,0,2,148,25,0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,120,26,0,2,121,26,
0,0,0,0,8,3,0,0,1,23,0,9,2,0,18,0,195,120,26,0,1,121,26,0,0,0,0,8,3,0,2,0,15,0,193,27,26,0,1,27,26,0,0,0,0
);

View File

@ -135,8 +135,11 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
);
{$include collation_sv_le.inc}
{$ifdef FPC_LITTLE_ENDIAN}
{$include collation_sv_le.inc}
{$else FPC_LITTLE_ENDIAN}
{$include collation_sv_be.inc}
{$endif FPC_LITTLE_ENDIAN}
var
CLDR_Collation : TUCA_DataBook = (
Base : nil;

File diff suppressed because it is too large Load Diff

View File

@ -2951,32 +2951,32 @@ const
const
UCA_PROPS : array[0..1562] of Byte = (
17,1,33,0,0,76,22,0,5,76,22,0,0,0,0,17,0,18,0,2,17,25,33,1,17,25,0,0,0,0,40,3,0,17,2,51,0,0,54,24,32,7,54,24,0,0,0,0,17,0,18,0,2,128,24,33,1,128,24,0,
0,0,0,8,3,0,17,0,18,0,2,128,24,34,2,128,24,0,0,0,0,11,3,0,17,1,33,0,0,76,22,0,0,76,22,0,0,0,0,17,0,18,0,2,17,25,33,0,17,25,0,0,0,0,40,3,0,17,2,51,
0,0,51,24,0,0,51,24,0,0,0,0,17,0,18,0,2,128,24,33,0,128,24,0,0,0,0,8,3,0,17,0,18,0,2,128,24,34,1,128,24,0,0,0,0,11,3,0,17,0,15,0,0,10,25,0,2,11,25,0,
0,0,0,17,0,15,0,0,10,25,0,1,10,25,0,0,0,0,17,0,15,0,0,13,25,32,3,13,25,0,0,0,0,17,0,15,0,0,49,22,34,2,49,22,0,0,0,0,17,0,15,0,0,33,25,33,1,33,25,0,
0,0,0,17,0,15,0,0,17,25,33,2,18,25,0,0,0,0,17,0,15,0,0,21,25,32,3,21,25,0,0,0,0,17,0,15,0,0,22,24,32,8,180,22,32,0,9,0,17,0,15,0,0,10,25,0,1,11,25,0,
0,0,0,17,0,15,0,0,10,25,0,0,10,25,0,0,0,0,17,0,15,0,0,10,25,1,2,11,25,0,0,0,0,17,0,15,0,0,49,22,34,1,49,22,0,0,0,0,17,0,15,0,0,33,25,33,0,33,25,0,
0,0,0,17,0,15,0,0,17,25,33,1,18,25,0,0,0,0,17,0,15,0,0,17,25,34,2,18,25,0,0,0,0,17,0,15,0,0,22,24,32,2,180,22,32,0,3,0,17,0,15,0,0,49,22,33,1,49,22,0,
0,0,0,17,0,15,0,0,49,22,33,0,49,22,0,0,0,0,17,0,15,0,0,25,25,33,1,25,25,0,0,0,0,17,0,15,0,0,25,25,33,0,25,25,0,0,0,0,17,0,15,0,0,29,25,32,3,29,25,0,
0,0,0,17,0,15,0,0,25,25,34,1,25,25,0,0,0,0,25,0,21,0,0,22,24,32,4,180,22,32,0,3,0,43,22,32,0,3,0,17,0,15,0,0,76,22,0,2,76,22,0,0,0,0,17,0,15,0,0,22,
24,32,4,180,22,32,0,3,0,17,0,15,0,0,54,24,32,13,54,24,0,0,0,0,17,0,15,0,0,76,22,0,9,76,22,0,0,0,0,17,0,15,0,0,54,24,32,11,54,24,0,0,0,0,17,0,15,0,0,54,
24,32,12,54,24,0,0,0,0,17,0,15,0,0,49,22,34,3,49,22,0,0,0,0,17,0,15,0,0,49,22,35,3,49,22,0,0,0,0,17,0,15,0,0,49,22,33,1,49,22,0,0,0,0,17,0,15,0,0,76,
22,0,10,76,22,0,0,0,0,57,0,45,0,0,22,24,32,9,180,22,32,0,9,0,76,22,0,0,5,0,76,22,0,0,0,0,17,23,32,0,8,0,192,251,2,0,0,0,0,0,0,0,1,0,17,0,15,0,0,76,
22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,8,76,22,0,0,0,0,17,0,15,0,0,54,
24,32,10,54,24,0,0,0,0,17,0,15,0,0,76,22,0,4,76,22,0,0,0,0,17,0,15,0,0,49,22,35,4,49,22,0,0,0,0,17,0,15,0,0,49,22,35,3,49,22,0,0,0,0,17,0,15,0,0,76,
22,0,6,76,22,0,0,0,0,17,0,15,0,0,22,24,32,9,180,22,32,0,9,0,17,0,15,0,0,54,24,32,8,54,24,0,0,0,0,17,0,15,0,0,76,22,0,1,76,22,0,0,0,0,17,0,15,0,0,22,
24,32,3,180,22,32,0,3,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,
22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,
24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,
24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,
22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,
22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,
24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,
22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,
22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,76,22,0,7,76,22,0,0,0,0,17,0,15,0,0,54,
24,32,9,54,24,0,0,0,0,17,0,15,0,0,76,22,0,3,76,22,0,0,0,0,17,0,15,0,0,54,24,32,13,54,24,0,0,0,0,17,0,15,0,0,76,22,0,8,76,22,0,0,0,0,17,0,15,0,0,54,
24,32,10,54,24,0,0,0,0,17,0,15,0,0,54,24,32,13,54,24,0,0,0,0,49,0,39,0,0,54,24,32,13,54,24,0,0,0,0,150,23,32,0,8,0,93,1,32,0,2,0,192,251,2,0,0,0,0,0,0,
2,1,33,0,193,76,22,0,5,76,22,0,0,0,0,2,0,18,0,195,17,25,33,1,17,25,0,0,0,0,40,3,0,2,2,51,0,193,54,24,32,7,54,24,0,0,0,0,2,0,18,0,195,128,24,33,1,128,24,0,
0,0,0,8,3,0,2,0,18,0,195,128,24,34,2,128,24,0,0,0,0,11,3,0,2,1,33,0,193,76,22,0,0,76,22,0,0,0,0,2,0,18,0,195,17,25,33,0,17,25,0,0,0,0,40,3,0,2,2,51,
0,193,51,24,0,0,51,24,0,0,0,0,2,0,18,0,195,128,24,33,0,128,24,0,0,0,0,8,3,0,2,0,18,0,195,128,24,34,1,128,24,0,0,0,0,11,3,0,2,0,15,0,193,10,25,0,2,11,25,0,
0,0,0,2,0,15,0,193,10,25,0,1,10,25,0,0,0,0,2,0,15,0,193,13,25,32,3,13,25,0,0,0,0,2,0,15,0,193,49,22,34,2,49,22,0,0,0,0,2,0,15,0,193,33,25,33,1,33,25,0,
0,0,0,2,0,15,0,193,17,25,33,2,18,25,0,0,0,0,2,0,15,0,193,21,25,32,3,21,25,0,0,0,0,2,0,15,0,193,22,24,32,8,180,22,32,0,9,0,2,0,15,0,193,10,25,0,1,11,25,0,
0,0,0,2,0,15,0,193,10,25,0,0,10,25,0,0,0,0,2,0,15,0,193,10,25,1,2,11,25,0,0,0,0,2,0,15,0,193,49,22,34,1,49,22,0,0,0,0,2,0,15,0,193,33,25,33,0,33,25,0,
0,0,0,2,0,15,0,193,17,25,33,1,18,25,0,0,0,0,2,0,15,0,193,17,25,34,2,18,25,0,0,0,0,2,0,15,0,193,22,24,32,2,180,22,32,0,3,0,2,0,15,0,193,49,22,33,1,49,22,0,
0,0,0,2,0,15,0,193,49,22,33,0,49,22,0,0,0,0,2,0,15,0,193,25,25,33,1,25,25,0,0,0,0,2,0,15,0,193,25,25,33,0,25,25,0,0,0,0,2,0,15,0,193,29,25,32,3,29,25,0,
0,0,0,2,0,15,0,193,25,25,34,1,25,25,0,0,0,0,3,0,21,0,193,22,24,32,4,180,22,32,0,3,0,43,22,32,0,3,0,2,0,15,0,193,76,22,0,2,76,22,0,0,0,0,2,0,15,0,193,22,
24,32,4,180,22,32,0,3,0,2,0,15,0,193,54,24,32,13,54,24,0,0,0,0,2,0,15,0,193,76,22,0,9,76,22,0,0,0,0,2,0,15,0,193,54,24,32,11,54,24,0,0,0,0,2,0,15,0,193,54,
24,32,12,54,24,0,0,0,0,2,0,15,0,193,49,22,34,3,49,22,0,0,0,0,2,0,15,0,193,49,22,35,3,49,22,0,0,0,0,2,0,15,0,193,49,22,33,1,49,22,0,0,0,0,2,0,15,0,193,76,
22,0,10,76,22,0,0,0,0,7,0,45,0,193,22,24,32,9,180,22,32,0,9,0,76,22,0,0,5,0,76,22,0,0,0,0,17,23,32,0,8,0,192,251,32,0,2,0,69,128,0,0,1,0,2,0,15,0,193,76,
22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,8,76,22,0,0,0,0,2,0,15,0,193,54,
24,32,10,54,24,0,0,0,0,2,0,15,0,193,76,22,0,4,76,22,0,0,0,0,2,0,15,0,193,49,22,35,4,49,22,0,0,0,0,2,0,15,0,193,49,22,35,3,49,22,0,0,0,0,2,0,15,0,193,76,
22,0,6,76,22,0,0,0,0,2,0,15,0,193,22,24,32,9,180,22,32,0,9,0,2,0,15,0,193,54,24,32,8,54,24,0,0,0,0,2,0,15,0,193,76,22,0,1,76,22,0,0,0,0,2,0,15,0,193,22,
24,32,3,180,22,32,0,3,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,
22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,
24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,
24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,
22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,
22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,
24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,
22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,
22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,76,22,0,7,76,22,0,0,0,0,2,0,15,0,193,54,
24,32,9,54,24,0,0,0,0,2,0,15,0,193,76,22,0,3,76,22,0,0,0,0,2,0,15,0,193,54,24,32,13,54,24,0,0,0,0,2,0,15,0,193,76,22,0,8,76,22,0,0,0,0,2,0,15,0,193,54,
24,32,10,54,24,0,0,0,0,2,0,15,0,193,54,24,32,13,54,24,0,0,0,0,6,0,39,0,193,54,24,32,13,54,24,0,0,0,0,150,23,32,0,8,0,93,1,32,0,2,0,192,251,32,0,2,0,80,128,0,
0,1,0
);

View File

@ -135,8 +135,11 @@ const
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
);
{$include collation_zh_le.inc}
{$ifdef FPC_LITTLE_ENDIAN}
{$include collation_zh_le.inc}
{$else FPC_LITTLE_ENDIAN}
{$include collation_zh_be.inc}
{$endif FPC_LITTLE_ENDIAN}
var
CLDR_Collation : TUCA_DataBook = (
Base : nil;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -26,6 +26,7 @@ unit unicodedata;
{$SCOPEDENUMS ON}
{$pointermath on}
{$define USE_INLINE}
{$warn 4056 off} //Conversion between ordinals and pointers is not portable
{ $define uni_debug}
interface
@ -172,10 +173,7 @@ type
property NumericValue : Double read GetNumericValue;
end;
const
BIT_POS_VALIDE = 0;
type
TWeightLength = 0..24;
TUCA_PropWeights = packed record
Weights : array[0..2] of Word;
end;
@ -225,35 +223,36 @@ type
TUCA_PropItemRec = packed record
private
const FLAG_VALID = 0;
const FLAG_CODEPOINT = 1;
const FLAG_CONTEXTUAL = 2;
const FLAG_DELETION = 3;
const FLAG_COMPRESS_WEIGHT_1 = 6;
const FLAG_COMPRESS_WEIGHT_2 = 7;
private
function GetWeightLength: TWeightLength;inline;
//procedure SetWeightLength(AValue: TWeightLength);inline;
function GetCodePoint() : UInt24;inline;
public
Valid : Byte;// On First Bit
WeightLength : Byte;
ChildCount : Byte;
Size : Word;
Flags : Byte;
public
function HasCodePoint() : Boolean;inline;
property CodePoint : UInt24 read GetCodePoint;
//WeightLength is stored in the 5 last bits of "Valid"
property WeightLength : TWeightLength read GetWeightLength;// write SetWeightLength;
//Weights : array[0..WeightLength] of TUCA_PropWeights;
function IsValid() : Boolean;inline;
//function GetWeightArray() : PUCA_PropWeights;inline;
procedure GetWeightArray(ADest : PUCA_PropWeights);
function GetSelfOnlySize() : Word;inline;
function GetSelfOnlySize() : Cardinal;inline;
function GetContextual() : Boolean;inline;
property Contextual : Boolean read GetContextual;
function GetContext() : PUCA_PropItemContextTreeRec;
function IsDeleted() : Boolean;inline;
function IsWeightCompress_1() : Boolean;inline;
function IsWeightCompress_2() : Boolean;inline;
end;
PUCA_PropItemRec = ^TUCA_PropItemRec;
@ -1191,9 +1190,14 @@ end;
{ TUCA_PropItemRec }
function TUCA_PropItemRec.GetWeightLength: TWeightLength;
function TUCA_PropItemRec.IsWeightCompress_1 : Boolean;
begin
Result := TWeightLength(Valid and Byte($F8) shr 3);
Result := IsBitON(Flags,FLAG_COMPRESS_WEIGHT_1);
end;
function TUCA_PropItemRec.IsWeightCompress_2 : Boolean;
begin
Result := IsBitON(Flags,FLAG_COMPRESS_WEIGHT_2);
end;
function TUCA_PropItemRec.GetCodePoint() : UInt24;
@ -1202,7 +1206,7 @@ begin
if Contextual then
Result := PUInt24(
PtrUInt(@Self) + Self.GetSelfOnlySize()- SizeOf(UInt24) -
Word(GetContext()^.Size)
Cardinal(GetContext()^.Size)
)^
else
Result := PUInt24(PtrUInt(@Self) + Self.GetSelfOnlySize() - SizeOf(UInt24))^
@ -1220,14 +1224,9 @@ begin
Result := IsBitON(Flags,FLAG_CODEPOINT);
end;
{procedure TUCA_PropItemRec.SetWeightLength(AValue: TWeightLength);
begin
Valid := Valid or Byte(Byte(AValue) shl 3);
end;}
function TUCA_PropItemRec.IsValid() : Boolean;
begin
Result := IsBitON(Valid,BIT_POS_VALIDE);
Result := IsBitON(Flags,FLAG_VALID);
end;
{function TUCA_PropItemRec.GetWeightArray: PUCA_PropWeights;
@ -1237,7 +1236,7 @@ end;}
procedure TUCA_PropItemRec.GetWeightArray(ADest: PUCA_PropWeights);
var
i, c : Integer;
c : Integer;
p : PByte;
pd : PUCA_PropWeights;
begin
@ -1246,14 +1245,14 @@ begin
pd := ADest;
pd^.Weights[0] := PWord(p)^;
p := p + 2;
if IsBitON(Self.Valid,(BIT_POS_VALIDE+1)) then begin
if not IsWeightCompress_1() then begin
pd^.Weights[1] := PWord(p)^;
p := p + 2;
end else begin
pd^.Weights[1] := p^;
p := p + 1;
end;
if IsBitON(Self.Valid,(BIT_POS_VALIDE+2)) then begin
if not IsWeightCompress_2() then begin
pd^.Weights[2] := PWord(p)^;
p := p + 2;
end else begin
@ -1264,20 +1263,20 @@ begin
Move(p^, (pd+1)^, ((c-1)*SizeOf(TUCA_PropWeights)));
end;
function TUCA_PropItemRec.GetSelfOnlySize() : Word;
function TUCA_PropItemRec.GetSelfOnlySize() : Cardinal;
begin
Result := SizeOf(TUCA_PropItemRec);
if (WeightLength > 0) then begin
Result := Result + (WeightLength * Sizeof(TUCA_PropWeights));
if not IsBitON(Self.Valid,(BIT_POS_VALIDE+1)) then
if IsWeightCompress_1() then
Result := Result - 1;
if not IsBitON(Self.Valid,(BIT_POS_VALIDE+2)) then
if IsWeightCompress_2() then
Result := Result - 1;
end;
if HasCodePoint() then
Result := Result + SizeOf(UInt24);
if Contextual then
Result := Result + Word(GetContext()^.Size);
Result := Result + Cardinal(GetContext()^.Size);
end;
function TUCA_PropItemRec.GetContextual: Boolean;
@ -1710,8 +1709,11 @@ var
k := AStartFrom;
if (k > c) then
exit(False);
if (IndexDWord(removedCharIndex[0],removedCharIndexLength,k) >= 0) then
if (removedCharIndexLength>0) and
(IndexDWord(removedCharIndex[0],removedCharIndexLength,k) >= 0)
then begin
exit(False);
end;
{if (k = (i+1)) or
( (k = (i+2)) and UnicodeIsHighSurrogate(s[i]) )
then
@ -1827,7 +1829,7 @@ var
var
ctxNode : PUCA_PropItemContextTreeNodeRec;
begin
if (pp^.GetWeightLength() > 0) then begin
if (pp^.WeightLength > 0) then begin
AddWeights(pp);
end else
if (LastKeyOwner.Length > 0) and pp^.Contextual and
@ -1849,7 +1851,7 @@ var
begin
while True do begin
if pp^.IsValid() then begin
if (pp^.GetWeightLength() > 0) then
if (pp^.WeightLength > 0) then
AddWeights(pp)
else
if (LastKeyOwner.Length > 0) and pp^.Contextual and
@ -1886,7 +1888,7 @@ var
end else begin
if pp^.IsValid()then begin
if (pp^.ChildCount = 0) then begin
if (pp^.GetWeightLength() > 0) then
if (pp^.WeightLength > 0) then
AddWeights(pp)
else
if (LastKeyOwner.Length > 0) and pp^.Contextual and
@ -1992,7 +1994,7 @@ begin
if (pp^.ChildCount = 0) or (i = c) then begin
ok := False;
if pp^.IsValid() and (suppressState.CharCount = 0) then begin
if (pp^.GetWeightLength() > 0) then begin
if (pp^.WeightLength > 0) then begin
AddWeightsAndClear();
ok := True;
end else
@ -2049,7 +2051,7 @@ begin
end;
while True do begin
if pp^.IsValid() and
(pp^.GetWeightLength() > 0) and
(pp^.WeightLength > 0) and
( ( (cl = suppressState.cl) and (ppLevel <> suppressState.CharCount) ) or
( (cl <> suppressState.cl) and (ppLevel < suppressState.CharCount) )
)
@ -2067,7 +2069,7 @@ begin
end;
if not ok then begin
if pp^.IsValid() and (suppressState.CharCount = 0) then begin
if (pp^.GetWeightLength() > 0) then begin
if (pp^.WeightLength > 0) then begin
AddWeightsAndClear();
ok := True;
end else
@ -2100,7 +2102,7 @@ begin
while HasHistory() do begin
GoBack();
if pp^.IsValid() and
(pp^.GetWeightLength() > 0) and
(pp^.WeightLength > 0) and
( (suppressState.CharCount = 0) or
( ( (cl = suppressState.cl) and (ppLevel <> suppressState.CharCount) ) or
( (cl <> suppressState.cl) and (ppLevel < suppressState.CharCount) )