summaryrefslogtreecommitdiff
path: root/lib/unigbrk
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2015-01-15 12:14:14 +0900
committerDaiki Ueno <ueno@gnu.org>2015-01-15 12:14:14 +0900
commit794132ffcb51368479556ad43981710a367240bd (patch)
treea9d6f25b9975756e3d5a9682501fa2c66735e445 /lib/unigbrk
parent4b6bc42e050611b12758490ee85c997e54790784 (diff)
downloadgnulib-794132ffcb51368479556ad43981710a367240bd.tar.gz
libunistring: update to Unicode 6.2.0
* lib/unilbrk/lbrktables.h (LBP_RI): New enumeration value. (unilbrk_table): Adjust table size. * lib/unilbrk/lbrktables.c (unilbrk_table): Add a row and column for LBP_RI. * lib/uniwbrk.in.h (WBP_RI): New enumeration value. * lib/uniwbrk/u-wordbreaks.h (FUNC): Support rule WB13c. Normalize table index skipping ignored properties. * lib/uniwbrk/wbrktable.c (uniwbrk_table): Support WBP_RI. Remove WBP_EXTEND and WBP_FORMAT, which are now computed without using the table. * lib/uniwbrk/wbrktable.h: Adjust table size. * lib/unigbrk.in.h (GBP_RI): New enumeration value. * lib/unigbrk/uc-is-grapheme-break.c (UC_IS_GRAPHEME_BREAK): Support rule GB8a. (UC_GRAPHEME_BREAKS_FOR, gb_table): Support GBP_RI. * tests/unigbrk/test-uc-is-grapheme-break.c (graphemebreakproperty_to_string): Support GBP_RI. * lib/gen-uni-tables.c (LBP_RI): New enumeration value. (get_lbp, debug_output_lbp, fill_org_lbp, debug_output_org_lbp) (output_lbp): Support LBP_RI. Adjust some characters changed from LBP_AL to LBP_ID. (output_lbp): Support LBP_RI. (WBP_RI): New enumeration value. (debug_output_wbp, fill_org_wbp, debug_output_org_wbp) (output_wbp): Support WBP_RI. (GBP_RI): New enumeration value. (output_gbp_test, fill_org_gbp): Support GBP_RI. * all generated files under lib/uni* and tests/uni*: Regenerate.
Diffstat (limited to 'lib/unigbrk')
-rw-r--r--lib/unigbrk/gbrkprop.h16
-rw-r--r--lib/unigbrk/uc-is-grapheme-break.c9
2 files changed, 19 insertions, 6 deletions
diff --git a/lib/unigbrk/gbrkprop.h b/lib/unigbrk/gbrkprop.h
index 9670734e58..2787626eb0 100644
--- a/lib/unigbrk/gbrkprop.h
+++ b/lib/unigbrk/gbrkprop.h
@@ -1,6 +1,6 @@
/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
/* Grapheme break property of Unicode characters. */
-/* Generated automatically by gen-uni-tables.c for Unicode 6.1.0. */
+/* Generated automatically by gen-uni-tables.c for Unicode 6.2.0. */
#define gbrkprop_header_0 16
#define gbrkprop_header_1 15
#define gbrkprop_header_2 7
@@ -11,7 +11,7 @@ struct
{
int level1[15];
short level2[3 << 9];
- unsigned char level3[(85 << 7) / 2];
+ unsigned char level3[(86 << 7) / 2];
}
unigbrkprop =
{
@@ -144,11 +144,11 @@ unigbrkprop =
-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, 5312, -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,
- 4224, 4224, 5312, 5376, 4224, 4224, 4224, 4224,
+ 4224, 4224, 5376, 5440, 4224, 4224, 4224, 4224,
4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224,
4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224,
4224, 4224, 4224, 4224, 4224, 4224, 4224, 4224,
@@ -878,6 +878,14 @@ unigbrkprop =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+ 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
diff --git a/lib/unigbrk/uc-is-grapheme-break.c b/lib/unigbrk/uc-is-grapheme-break.c
index 5bf61c08a2..049cc4cf7d 100644
--- a/lib/unigbrk/uc-is-grapheme-break.c
+++ b/lib/unigbrk/uc-is-grapheme-break.c
@@ -47,6 +47,9 @@
/* GB8 */ \
((A) == GBP_LVT || (A) == GBP_T) && (B) == GBP_T ? false : \
\
+ /* GB8a */ \
+ (A) == GBP_RI && (B) == GBP_RI ? false : \
+ \
/* GB9 */ \
(B) == GBP_EXTEND ? false : \
\
@@ -71,9 +74,10 @@
| (UC_IS_GRAPHEME_BREAK(A, GBP_V) << GBP_V) \
| (UC_IS_GRAPHEME_BREAK(A, GBP_T) << GBP_T) \
| (UC_IS_GRAPHEME_BREAK(A, GBP_LV) << GBP_LV) \
- | (UC_IS_GRAPHEME_BREAK(A, GBP_LVT) << GBP_LVT))
+ | (UC_IS_GRAPHEME_BREAK(A, GBP_LVT) << GBP_LVT) \
+ | (UC_IS_GRAPHEME_BREAK(A, GBP_RI) << GBP_RI))
-static const unsigned short int gb_table[12] =
+static const unsigned short int gb_table[13] =
{
UC_GRAPHEME_BREAKS_FOR(0), /* GBP_OTHER */
UC_GRAPHEME_BREAKS_FOR(1), /* GBP_CR */
@@ -87,6 +91,7 @@ static const unsigned short int gb_table[12] =
UC_GRAPHEME_BREAKS_FOR(9), /* GBP_T */
UC_GRAPHEME_BREAKS_FOR(10), /* GBP_LV */
UC_GRAPHEME_BREAKS_FOR(11), /* GBP_LVT */
+ UC_GRAPHEME_BREAKS_FOR(12), /* GBP_RI */
};
bool