based on Unicode 6.1.0

use C99 standard fixed width types from stdint.h

diff --git a/NEWS b/NEWS
index 1ef0583bb64686f89d820603fad23b5d154ba4d1..d364b0ea531e456237ce80c33cb652491fe4675d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Changes in ?.?.?
+================
+
+* UPD: based on Unicode 6.1.0
+
 Changes in 2.2.2
 ================
 

diff --git a/contrib/shell_utils/make-casetable.pl b/contrib/shell_utils/make-casetable.pl
index 4c719473454850cd329d619a3dfac220e7eb9000..5d2a314b8a36db332e5beff68298fb03e023a35a 100755 (executable)
--- a/contrib/shell_utils/make-casetable.pl
+++ b/contrib/shell_utils/make-casetable.pl
@@ -231,7 +231,7 @@ sub make_array{
             $char_start = ($block_start -1)* 64;
             $char_end = ($block_end * 64) -1;
 
-            printf(CHEADER "static const u\_int16\_t %s\_table\_%d\[%d\] \= \{\n",
+            printf(CHEADER "static const uint16\_t %s\_table\_%d\[%d\] \= \{\n",
                    $_[0], $table_no, $char_end - $char_start +1);
 
             for ($char = $char_start ; $char <= $char_end ; $char++) {
@@ -291,7 +291,7 @@ sub make_array{
             $char_start = ($block_start -1)* 64;
             $char_end = ($block_end * 64) -1;
 
-            printf(CHEADER "static const u\_int32\_t %s\_table\_sp\_%d\[%d\] \= \{\n",
+            printf(CHEADER "static const uint32\_t %s\_table\_sp\_%d\[%d\] \= \{\n",
                    $_[0], $table_no, $char_end - $char_start +1);
 
             for ($char = $char_start ; $char <= $char_end ; $char++) {

diff --git a/libatalk/unicode/precompose.h b/libatalk/unicode/precompose.h
index 5b47a78bf7ee990423b20502f18aa838ae4ea955..256c1fae06cbb849bf7e20f5d9b60c2f4cbfc9f7 100644 (file)
--- a/libatalk/unicode/precompose.h
+++ b/libatalk/unicode/precompose.h
@@ -19,8 +19,8 @@
 #define DECOMP_COUNT 955
 #define MAXCOMBLEN 3
 
-#define PRECOMP_SP_COUNT 16
-#define DECOMP_SP_COUNT 16
+#define PRECOMP_SP_COUNT 18
+#define DECOMP_SP_COUNT 18
 #define MAXCOMBSPLEN 4
 
 #define COMBBUFLEN 4  /* max(MAXCOMBLEN,MAXCOMBSPLEN) */
@@ -1033,6 +1033,8 @@ static const struct {
 /*{ 0x0001109A, 0x00011099, 0x000110BA },*/   /* KAITHI LETTER DDDHA */
 /*{ 0x0001109C, 0x0001109B, 0x000110BA },*/   /* KAITHI LETTER RHA */
 /*{ 0x000110AB, 0x000110A5, 0x000110BA },*/   /* KAITHI LETTER VA */
+/*{ 0x0001112E, 0x00011131, 0x00011127 },*/   /* CHAKMA VOWEL SIGN O */
+/*{ 0x0001112F, 0x00011132, 0x00011127 },*/   /* CHAKMA VOWEL SIGN AU */
 /*{ 0x0001D15E, 0x0001D157, 0x0001D165 },*/   /* MUSICAL SYMBOL HALF NOTE */
 /*{ 0x0001D15F, 0x0001D158, 0x0001D165 },*/   /* MUSICAL SYMBOL QUARTER NOTE */
 /*{ 0x0001D160, 0x0001D15F, 0x0001D16E },*/   /* MUSICAL SYMBOL EIGHTH NOTE */
@@ -2056,6 +2058,8 @@ static const struct {
 /*{ 0x0001109A, 0x00011099, 0x000110BA },*/   /* KAITHI LETTER DDDHA */
 /*{ 0x0001109C, 0x0001109B, 0x000110BA },*/   /* KAITHI LETTER RHA */
 /*{ 0x000110AB, 0x000110A5, 0x000110BA },*/   /* KAITHI LETTER VA */
+/*{ 0x0001112E, 0x00011131, 0x00011127 },*/   /* CHAKMA VOWEL SIGN O */
+/*{ 0x0001112F, 0x00011132, 0x00011127 },*/   /* CHAKMA VOWEL SIGN AU */
 /*{ 0x0001D15E, 0x0001D157, 0x0001D165 },*/   /* MUSICAL SYMBOL HALF NOTE */
 /*{ 0x0001D15F, 0x0001D158, 0x0001D165 },*/   /* MUSICAL SYMBOL QUARTER NOTE */
 /*{ 0x0001D160, 0x0001D15F, 0x0001D16E },*/   /* MUSICAL SYMBOL EIGHTH NOTE */
@@ -2079,6 +2083,8 @@ static const struct {
   { 0xD804DC9A, 0xD804DC99, 0xD804DCBA },     /* KAITHI LETTER DDDHA */
   { 0xD804DC9C, 0xD804DC9B, 0xD804DCBA },     /* KAITHI LETTER RHA */
   { 0xD804DCAB, 0xD804DCA5, 0xD804DCBA },     /* KAITHI LETTER VA */
+  { 0xD804DD2E, 0xD804DD31, 0xD804DD27 },     /* CHAKMA VOWEL SIGN O */
+  { 0xD804DD2F, 0xD804DD32, 0xD804DD27 },     /* CHAKMA VOWEL SIGN AU */
   { 0xD834DD5E, 0xD834DD57, 0xD834DD65 },     /* MUSICAL SYMBOL HALF NOTE */
   { 0xD834DD5F, 0xD834DD58, 0xD834DD65 },     /* MUSICAL SYMBOL QUARTER NOTE */
   { 0xD834DD60, 0xD834DD5F, 0xD834DD6E },     /* MUSICAL SYMBOL EIGHTH NOTE */
@@ -2102,6 +2108,8 @@ static const struct {
   { 0xD804DC9A, 0xD804DC99, 0xD804DCBA },     /* KAITHI LETTER DDDHA */
   { 0xD804DC9C, 0xD804DC9B, 0xD804DCBA },     /* KAITHI LETTER RHA */
   { 0xD804DCAB, 0xD804DCA5, 0xD804DCBA },     /* KAITHI LETTER VA */
+  { 0xD804DD2E, 0xD804DD31, 0xD804DD27 },     /* CHAKMA VOWEL SIGN O */
+  { 0xD804DD2F, 0xD804DD32, 0xD804DD27 },     /* CHAKMA VOWEL SIGN AU */
   { 0xD834DD5E, 0xD834DD57, 0xD834DD65 },     /* MUSICAL SYMBOL HALF NOTE */
   { 0xD834DD5F, 0xD834DD58, 0xD834DD65 },     /* MUSICAL SYMBOL QUARTER NOTE */
   { 0xD834DD60, 0xD834DD5F, 0xD834DD6E },     /* MUSICAL SYMBOL EIGHTH NOTE */

diff --git a/libatalk/unicode/utf16_casetable.h b/libatalk/unicode/utf16_casetable.h
index cc00975ed333c4f6edaede90606ccd6e30f90927..188e1ea75fb24df3d57a04bbfa854d5338b9f48f 100644 (file)
--- a/libatalk/unicode/utf16_casetable.h
+++ b/libatalk/unicode/utf16_casetable.h
@@ -8,7 +8,7 @@ UnicodeData.txt is got from
 http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
 */
 
-static const u_int16_t upper_table_1[704] = {
+static const uint16_t upper_table_1[704] = {
   0x0000, /*U+0000*/ /**/
   0x0001, /*U+0001*/ /**/
   0x0002, /*U+0002*/ /**/
@@ -623,7 +623,7 @@ static const u_int16_t upper_table_1[704] = {
   0x0194, /*U+0263*/ /*LATIN SMALL LETTER GAMMA*/
   0x0264, /*U+0264*/ /**/
   0xA78D, /*U+0265*/ /*LATIN SMALL LETTER TURNED H*/
-  0x0266, /*U+0266*/ /**/
+  0xA7AA, /*U+0266*/ /*LATIN SMALL LETTER H WITH HOOK*/
   0x0267, /*U+0267*/ /**/
   0x0197, /*U+0268*/ /*LATIN SMALL LETTER I WITH STROKE*/
   0x0196, /*U+0269*/ /*LATIN SMALL LETTER IOTA*/
@@ -715,7 +715,7 @@ static const u_int16_t upper_table_1[704] = {
   0x02BF, /*U+02BF*/ /**/
 };
 
-static const u_int16_t upper_table_2[640] = {
+static const uint16_t upper_table_2[640] = {
   0x0340, /*U+0340*/ /**/
   0x0341, /*U+0341*/ /**/
   0x0342, /*U+0342*/ /**/
@@ -1358,7 +1358,7 @@ static const u_int16_t upper_table_2[640] = {
   0x05BF, /*U+05BF*/ /**/
 };
 
-static const u_int16_t upper_table_3[64] = {
+static const uint16_t upper_table_3[64] = {
   0x1D40, /*U+1D40*/ /**/
   0x1D41, /*U+1D41*/ /**/
   0x1D42, /*U+1D42*/ /**/
@@ -1425,7 +1425,7 @@ static const u_int16_t upper_table_3[64] = {
   0x1D7F, /*U+1D7F*/ /**/
 };
 
-static const u_int16_t upper_table_4[512] = {
+static const uint16_t upper_table_4[512] = {
   0x1E00, /*U+1E00*/ /**/
   0x1E00, /*U+1E01*/ /*LATIN SMALL LETTER A WITH RING BELOW*/
   0x1E02, /*U+1E02*/ /**/
@@ -1940,7 +1940,7 @@ static const u_int16_t upper_table_4[512] = {
   0x1FFF, /*U+1FFF*/ /**/
 };
 
-static const u_int16_t upper_table_5[128] = {
+static const uint16_t upper_table_5[128] = {
   0x2140, /*U+2140*/ /**/
   0x2141, /*U+2141*/ /**/
   0x2142, /*U+2142*/ /**/
@@ -2071,7 +2071,7 @@ static const u_int16_t upper_table_5[128] = {
   0x21BF, /*U+21BF*/ /**/
 };
 
-static const u_int16_t upper_table_6[64] = {
+static const uint16_t upper_table_6[64] = {
   0x24C0, /*U+24C0*/ /**/
   0x24C1, /*U+24C1*/ /**/
   0x24C2, /*U+24C2*/ /**/
@@ -2138,7 +2138,7 @@ static const u_int16_t upper_table_6[64] = {
   0x24FF, /*U+24FF*/ /**/
 };
 
-static const u_int16_t upper_table_7[320] = {
+static const uint16_t upper_table_7[320] = {
   0x2C00, /*U+2C00*/ /**/
   0x2C01, /*U+2C01*/ /**/
   0x2C02, /*U+2C02*/ /**/
@@ -2382,7 +2382,7 @@ static const u_int16_t upper_table_7[320] = {
   0x2CF0, /*U+2CF0*/ /**/
   0x2CF1, /*U+2CF1*/ /**/
   0x2CF2, /*U+2CF2*/ /**/
-  0x2CF3, /*U+2CF3*/ /**/
+  0x2CF2, /*U+2CF3*/ /*COPTIC SMALL LETTER BOHAIRIC KHEI*/
   0x2CF4, /*U+2CF4*/ /**/
   0x2CF5, /*U+2CF5*/ /**/
   0x2CF6, /*U+2CF6*/ /**/
@@ -2434,13 +2434,13 @@ static const u_int16_t upper_table_7[320] = {
   0x10C4, /*U+2D24*/ /*GEORGIAN SMALL LETTER HAR*/
   0x10C5, /*U+2D25*/ /*GEORGIAN SMALL LETTER HOE*/
   0x2D26, /*U+2D26*/ /**/
-  0x2D27, /*U+2D27*/ /**/
+  0x10C7, /*U+2D27*/ /*GEORGIAN SMALL LETTER YN*/
   0x2D28, /*U+2D28*/ /**/
   0x2D29, /*U+2D29*/ /**/
   0x2D2A, /*U+2D2A*/ /**/
   0x2D2B, /*U+2D2B*/ /**/
   0x2D2C, /*U+2D2C*/ /**/
-  0x2D2D, /*U+2D2D*/ /**/
+  0x10CD, /*U+2D2D*/ /*GEORGIAN SMALL LETTER AEN*/
   0x2D2E, /*U+2D2E*/ /**/
   0x2D2F, /*U+2D2F*/ /**/
   0x2D30, /*U+2D30*/ /**/
@@ -2461,7 +2461,7 @@ static const u_int16_t upper_table_7[320] = {
   0x2D3F, /*U+2D3F*/ /**/
 };
 
-static const u_int16_t upper_table_8[128] = {
+static const uint16_t upper_table_8[128] = {
   0xA640, /*U+A640*/ /**/
   0xA640, /*U+A641*/ /*CYRILLIC SMALL LETTER ZEMLYA*/
   0xA642, /*U+A642*/ /**/
@@ -2592,7 +2592,7 @@ static const u_int16_t upper_table_8[128] = {
   0xA6BF, /*U+A6BF*/ /**/
 };
 
-static const u_int16_t upper_table_9[192] = {
+static const uint16_t upper_table_9[192] = {
   0xA700, /*U+A700*/ /**/
   0xA701, /*U+A701*/ /**/
   0xA702, /*U+A702*/ /**/
@@ -2740,7 +2740,7 @@ static const u_int16_t upper_table_9[192] = {
   0xA790, /*U+A790*/ /**/
   0xA790, /*U+A791*/ /*LATIN SMALL LETTER N WITH DESCENDER*/
   0xA792, /*U+A792*/ /**/
-  0xA793, /*U+A793*/ /**/
+  0xA792, /*U+A793*/ /*LATIN SMALL LETTER C WITH BAR*/
   0xA794, /*U+A794*/ /**/
   0xA795, /*U+A795*/ /**/
   0xA796, /*U+A796*/ /**/
@@ -2787,7 +2787,7 @@ static const u_int16_t upper_table_9[192] = {
   0xA7BF, /*U+A7BF*/ /**/
 };
 
-static const u_int16_t upper_table_10[64] = {
+static const uint16_t upper_table_10[64] = {
   0xFF40, /*U+FF40*/ /**/
   0xFF21, /*U+FF41*/ /*FULLWIDTH LATIN SMALL LETTER A*/
   0xFF22, /*U+FF42*/ /*FULLWIDTH LATIN SMALL LETTER B*/
@@ -2854,7 +2854,7 @@ static const u_int16_t upper_table_10[64] = {
   0xFF7F, /*U+FF7F*/ /**/
 };
 
-static const u_int32_t upper_table_sp_1[128] = {
+static const uint32_t upper_table_sp_1[128] = {
   0xD801DC00, /*0xD801DC00*/ /*U+010400*/ /*U+010400*/ /**/
   0xD801DC01, /*0xD801DC01*/ /*U+010401*/ /*U+010401*/ /**/
   0xD801DC02, /*0xD801DC02*/ /*U+010402*/ /*U+010402*/ /**/
@@ -2985,7 +2985,7 @@ static const u_int32_t upper_table_sp_1[128] = {
   0xD801DC7F, /*0xD801DC7F*/ /*U+01047F*/ /*U+01047F*/ /**/
 };
 
-static const u_int16_t lower_table_1[128] = {
+static const uint16_t lower_table_1[128] = {
   0x0000, /*U+0000*/ /**/
   0x0001, /*U+0001*/ /**/
   0x0002, /*U+0002*/ /**/
@@ -3116,7 +3116,7 @@ static const u_int16_t lower_table_1[128] = {
   0x007F, /*U+007F*/ /**/
 };
 
-static const u_int16_t lower_table_2[448] = {
+static const uint16_t lower_table_2[448] = {
   0x00E0, /*U+00C0*/ /*LATIN CAPITAL LETTER A WITH GRAVE*/
   0x00E1, /*U+00C1*/ /*LATIN CAPITAL LETTER A WITH ACUTE*/
   0x00E2, /*U+00C2*/ /*LATIN CAPITAL LETTER A WITH CIRCUMFLEX*/
@@ -3567,7 +3567,7 @@ static const u_int16_t lower_table_2[448] = {
   0x027F, /*U+027F*/ /**/
 };
 
-static const u_int16_t lower_table_3[576] = {
+static const uint16_t lower_table_3[576] = {
   0x0340, /*U+0340*/ /**/
   0x0341, /*U+0341*/ /**/
   0x0342, /*U+0342*/ /**/
@@ -4146,7 +4146,7 @@ static const u_int16_t lower_table_3[576] = {
   0x057F, /*U+057F*/ /**/
 };
 
-static const u_int16_t lower_table_4[128] = {
+static const uint16_t lower_table_4[128] = {
   0x1080, /*U+1080*/ /**/
   0x1081, /*U+1081*/ /**/
   0x1082, /*U+1082*/ /**/
@@ -4218,13 +4218,13 @@ static const u_int16_t lower_table_4[128] = {
   0x2D24, /*U+10C4*/ /*GEORGIAN CAPITAL LETTER HAR*/
   0x2D25, /*U+10C5*/ /*GEORGIAN CAPITAL LETTER HOE*/
   0x10C6, /*U+10C6*/ /**/
-  0x10C7, /*U+10C7*/ /**/
+  0x2D27, /*U+10C7*/ /*GEORGIAN CAPITAL LETTER YN*/
   0x10C8, /*U+10C8*/ /**/
   0x10C9, /*U+10C9*/ /**/
   0x10CA, /*U+10CA*/ /**/
   0x10CB, /*U+10CB*/ /**/
   0x10CC, /*U+10CC*/ /**/
-  0x10CD, /*U+10CD*/ /**/
+  0x2D2D, /*U+10CD*/ /*GEORGIAN CAPITAL LETTER AEN*/
   0x10CE, /*U+10CE*/ /**/
   0x10CF, /*U+10CF*/ /**/
   0x10D0, /*U+10D0*/ /**/
@@ -4277,7 +4277,7 @@ static const u_int16_t lower_table_4[128] = {
   0x10FF, /*U+10FF*/ /**/
 };
 
-static const u_int16_t lower_table_5[512] = {
+static const uint16_t lower_table_5[512] = {
   0x1E01, /*U+1E00*/ /*LATIN CAPITAL LETTER A WITH RING BELOW*/
   0x1E01, /*U+1E01*/ /**/
   0x1E03, /*U+1E02*/ /*LATIN CAPITAL LETTER B WITH DOT ABOVE*/
@@ -4792,7 +4792,7 @@ static const u_int16_t lower_table_5[512] = {
   0x1FFF, /*U+1FFF*/ /**/
 };
 
-static const u_int16_t lower_table_6[192] = {
+static const uint16_t lower_table_6[192] = {
   0x2100, /*U+2100*/ /**/
   0x2101, /*U+2101*/ /**/
   0x2102, /*U+2102*/ /**/
@@ -4987,7 +4987,7 @@ static const u_int16_t lower_table_6[192] = {
   0x21BF, /*U+21BF*/ /**/
 };
 
-static const u_int16_t lower_table_7[128] = {
+static const uint16_t lower_table_7[128] = {
   0x2480, /*U+2480*/ /**/
   0x2481, /*U+2481*/ /**/
   0x2482, /*U+2482*/ /**/
@@ -5118,7 +5118,7 @@ static const u_int16_t lower_table_7[128] = {
   0x24FF, /*U+24FF*/ /**/
 };
 
-static const u_int16_t lower_table_8[256] = {
+static const uint16_t lower_table_8[256] = {
   0x2C30, /*U+2C00*/ /*GLAGOLITIC CAPITAL LETTER AZU*/
   0x2C31, /*U+2C01*/ /*GLAGOLITIC CAPITAL LETTER BUKY*/
   0x2C32, /*U+2C02*/ /*GLAGOLITIC CAPITAL LETTER VEDE*/
@@ -5361,7 +5361,7 @@ static const u_int16_t lower_table_8[256] = {
   0x2CEF, /*U+2CEF*/ /**/
   0x2CF0, /*U+2CF0*/ /**/
   0x2CF1, /*U+2CF1*/ /**/
-  0x2CF2, /*U+2CF2*/ /**/
+  0x2CF3, /*U+2CF2*/ /*COPTIC CAPITAL LETTER BOHAIRIC KHEI*/
   0x2CF3, /*U+2CF3*/ /**/
   0x2CF4, /*U+2CF4*/ /**/
   0x2CF5, /*U+2CF5*/ /**/
@@ -5377,7 +5377,7 @@ static const u_int16_t lower_table_8[256] = {
   0x2CFF, /*U+2CFF*/ /**/
 };
 
-static const u_int16_t lower_table_9[128] = {
+static const uint16_t lower_table_9[128] = {
   0xA641, /*U+A640*/ /*CYRILLIC CAPITAL LETTER ZEMLYA*/
   0xA641, /*U+A641*/ /**/
   0xA643, /*U+A642*/ /*CYRILLIC CAPITAL LETTER DZELO*/
@@ -5508,7 +5508,7 @@ static const u_int16_t lower_table_9[128] = {
   0xA6BF, /*U+A6BF*/ /**/
 };
 
-static const u_int16_t lower_table_10[192] = {
+static const uint16_t lower_table_10[192] = {
   0xA700, /*U+A700*/ /**/
   0xA701, /*U+A701*/ /**/
   0xA702, /*U+A702*/ /**/
@@ -5655,7 +5655,7 @@ static const u_int16_t lower_table_10[192] = {
   0xA78F, /*U+A78F*/ /**/
   0xA791, /*U+A790*/ /*LATIN CAPITAL LETTER N WITH DESCENDER*/
   0xA791, /*U+A791*/ /**/
-  0xA792, /*U+A792*/ /**/
+  0xA793, /*U+A792*/ /*LATIN CAPITAL LETTER C WITH BAR*/
   0xA793, /*U+A793*/ /**/
   0xA794, /*U+A794*/ /**/
   0xA795, /*U+A795*/ /**/
@@ -5679,7 +5679,7 @@ static const u_int16_t lower_table_10[192] = {
   0xA7A7, /*U+A7A7*/ /**/
   0xA7A9, /*U+A7A8*/ /*LATIN CAPITAL LETTER S WITH OBLIQUE STROKE*/
   0xA7A9, /*U+A7A9*/ /**/
-  0xA7AA, /*U+A7AA*/ /**/
+  0x0266, /*U+A7AA*/ /*LATIN CAPITAL LETTER H WITH HOOK*/
   0xA7AB, /*U+A7AB*/ /**/
   0xA7AC, /*U+A7AC*/ /**/
   0xA7AD, /*U+A7AD*/ /**/
@@ -5703,7 +5703,7 @@ static const u_int16_t lower_table_10[192] = {
   0xA7BF, /*U+A7BF*/ /**/
 };
 
-static const u_int16_t lower_table_11[64] = {
+static const uint16_t lower_table_11[64] = {
   0xFF00, /*U+FF00*/ /**/
   0xFF01, /*U+FF01*/ /**/
   0xFF02, /*U+FF02*/ /**/
@@ -5770,7 +5770,7 @@ static const u_int16_t lower_table_11[64] = {
   0xFF3F, /*U+FF3F*/ /**/
 };
 
-static const u_int32_t lower_table_sp_1[64] = {
+static const uint32_t lower_table_sp_1[64] = {
   0xD801DC28, /*0xD801DC00*/ /*U+010428*/ /*U+010400*/ /*DESERET CAPITAL LETTER LONG I*/
   0xD801DC29, /*0xD801DC01*/ /*U+010429*/ /*U+010401*/ /*DESERET CAPITAL LETTER LONG E*/
   0xD801DC2A, /*0xD801DC02*/ /*U+01042A*/ /*U+010402*/ /*DESERET CAPITAL LETTER LONG A*/