New upstream version 6.9.9upstream/6.9.9upstream

1 files changed, 388 insertions, 177 deletions

diff --git a/src/unicode_property_data_posix.c b/src/unicode_property_data_posix.c
index 29ced3c..a407d8d 100644
--- a/src/unicode_property_data_posix.c
+++ b/src/unicode_property_data_posix.c
@@ -34,7 +34,7 @@
 /* Generated by make_unicode_property_data.py. */
 
 /*-
- * Copyright (c) 2016-2021  K.Kosako
+ * Copyright (c) 2016-2023  K.Kosako
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -68,7 +68,7 @@ CR_NEWLINE[] = { 1,
 
 /* PROPERTY: 'Alpha': POSIX [[:Alpha:]] */
 static const OnigCodePoint
-CR_Alpha[] = { 722,
+CR_Alpha[] = { 733,
 0x0041, 0x005a,
 0x0061, 0x007a,
 0x00aa, 0x00aa,
@@ -203,8 +203,7 @@ CR_Alpha[] = { 722,
 0x0bca, 0x0bcc,
 0x0bd0, 0x0bd0,
 0x0bd7, 0x0bd7,
-0x0c00, 0x0c03,
-0x0c05, 0x0c0c,
+0x0c00, 0x0c0c,
 0x0c0e, 0x0c10,
 0x0c12, 0x0c28,
 0x0c2a, 0x0c39,
@@ -227,7 +226,7 @@ CR_Alpha[] = { 722,
 0x0cd5, 0x0cd6,
 0x0cdd, 0x0cde,
 0x0ce0, 0x0ce3,
-0x0cf1, 0x0cf2,
+0x0cf1, 0x0cf3,
 0x0d00, 0x0d0c,
 0x0d0e, 0x0d10,
 0x0d12, 0x0d3a,
@@ -265,7 +264,7 @@ CR_Alpha[] = { 722,
 0x0f00, 0x0f00,
 0x0f40, 0x0f47,
 0x0f49, 0x0f6c,
-0x0f71, 0x0f81,
+0x0f71, 0x0f83,
 0x0f88, 0x0f97,
 0x0f99, 0x0fbc,
 0x1000, 0x1036,
@@ -567,7 +566,7 @@ CR_Alpha[] = { 722,
 0x10fe0, 0x10ff6,
 0x11000, 0x11045,
 0x11071, 0x11075,
-0x11082, 0x110b8,
+0x11080, 0x110b8,
 0x110c2, 0x110c2,
 0x110d0, 0x110e8,
 0x11100, 0x11132,
@@ -582,7 +581,7 @@ CR_Alpha[] = { 722,
 0x11200, 0x11211,
 0x11213, 0x11234,
 0x11237, 0x11237,
-0x1123e, 0x1123e,
+0x1123e, 0x11241,
 0x11280, 0x11286,
 0x11288, 0x11288,
 0x1128a, 0x1128d,
@@ -662,12 +661,16 @@ CR_Alpha[] = { 722,
 0x11d93, 0x11d96,
 0x11d98, 0x11d98,
 0x11ee0, 0x11ef6,
+0x11f00, 0x11f10,
+0x11f12, 0x11f3a,
+0x11f3e, 0x11f40,
 0x11fb0, 0x11fb0,
 0x12000, 0x12399,
 0x12400, 0x1246e,
 0x12480, 0x12543,
 0x12f90, 0x12ff0,
-0x13000, 0x1342e,
+0x13000, 0x1342f,
+0x13441, 0x13446,
 0x14400, 0x14646,
 0x16800, 0x16a38,
 0x16a40, 0x16a5e,
@@ -691,7 +694,9 @@ CR_Alpha[] = { 722,
 0x1aff5, 0x1affb,
 0x1affd, 0x1affe,
 0x1b000, 0x1b122,
+0x1b132, 0x1b132,
 0x1b150, 0x1b152,
+0x1b155, 0x1b155,
 0x1b164, 0x1b167,
 0x1b170, 0x1b2fb,
 0x1bc00, 0x1bc6a,
@@ -730,16 +735,20 @@ CR_Alpha[] = { 722,
 0x1d7aa, 0x1d7c2,
 0x1d7c4, 0x1d7cb,
 0x1df00, 0x1df1e,
+0x1df25, 0x1df2a,
 0x1e000, 0x1e006,
 0x1e008, 0x1e018,
 0x1e01b, 0x1e021,
 0x1e023, 0x1e024,
 0x1e026, 0x1e02a,
+0x1e030, 0x1e06d,
+0x1e08f, 0x1e08f,
 0x1e100, 0x1e12c,
 0x1e137, 0x1e13d,
 0x1e14e, 0x1e14e,
 0x1e290, 0x1e2ad,
 0x1e2c0, 0x1e2eb,
+0x1e4d0, 0x1e4eb,
 0x1e7e0, 0x1e7e6,
 0x1e7e8, 0x1e7eb,
 0x1e7ed, 0x1e7ee,
@@ -785,12 +794,14 @@ CR_Alpha[] = { 722,
 0x1f150, 0x1f169,
 0x1f170, 0x1f189,
 0x20000, 0x2a6df,
-0x2a700, 0x2b738,
+0x2a700, 0x2b739,
 0x2b740, 0x2b81d,
 0x2b820, 0x2cea1,
 0x2ceb0, 0x2ebe0,
+0x2ebf0, 0x2ee5d,
 0x2f800, 0x2fa1d,
 0x30000, 0x3134a,
+0x31350, 0x323af,
 }; /* END of CR_Alpha */
 
 /* PROPERTY: 'Blank': POSIX [[:Blank:]] */
@@ -815,7 +826,7 @@ CR_Cntrl[] = { 2,
 
 /* PROPERTY: 'Digit': POSIX [[:Digit:]] */
 static const OnigCodePoint
-CR_Digit[] = { 62,
+CR_Digit[] = { 64,
 0x0030, 0x0039,
 0x0660, 0x0669,
 0x06f0, 0x06f9,
@@ -870,19 +881,21 @@ CR_Digit[] = { 62,
 0x11c50, 0x11c59,
 0x11d50, 0x11d59,
 0x11da0, 0x11da9,
+0x11f50, 0x11f59,
 0x16a60, 0x16a69,
 0x16ac0, 0x16ac9,
 0x16b50, 0x16b59,
 0x1d7ce, 0x1d7ff,
 0x1e140, 0x1e149,
 0x1e2f0, 0x1e2f9,
+0x1e4f0, 0x1e4f9,
 0x1e950, 0x1e959,
 0x1fbf0, 0x1fbf9,
 }; /* END of CR_Digit */
 
 /* PROPERTY: 'Graph': POSIX [[:Graph:]] */
 static const OnigCodePoint
-CR_Graph[] = { 703,
+CR_Graph[] = { 713,
 0x0021, 0x007e,
 0x00a1, 0x0377,
 0x037a, 0x037f,
@@ -1005,7 +1018,7 @@ CR_Graph[] = { 703,
 0x0cdd, 0x0cde,
 0x0ce0, 0x0ce3,
 0x0ce6, 0x0cef,
-0x0cf1, 0x0cf2,
+0x0cf1, 0x0cf3,
 0x0d00, 0x0d0c,
 0x0d0e, 0x0d10,
 0x0d12, 0x0d44,
@@ -1035,7 +1048,7 @@ CR_Graph[] = { 703,
 0x0ea7, 0x0ebd,
 0x0ec0, 0x0ec4,
 0x0ec6, 0x0ec6,
-0x0ec8, 0x0ecd,
+0x0ec8, 0x0ece,
 0x0ed0, 0x0ed9,
 0x0edc, 0x0edf,
 0x0f00, 0x0f47,
@@ -1157,14 +1170,14 @@ CR_Graph[] = { 703,
 0x2e80, 0x2e99,
 0x2e9b, 0x2ef3,
 0x2f00, 0x2fd5,
-0x2ff0, 0x2ffb,
+0x2ff0, 0x2fff,
 0x3001, 0x303f,
 0x3041, 0x3096,
 0x3099, 0x30ff,
 0x3105, 0x312f,
 0x3131, 0x318e,
 0x3190, 0x31e3,
-0x31f0, 0x321e,
+0x31ef, 0x321e,
 0x3220, 0xa48c,
 0xa490, 0xa4c6,
 0xa4d0, 0xa62b,
@@ -1310,7 +1323,7 @@ CR_Graph[] = { 703,
 0x10e80, 0x10ea9,
 0x10eab, 0x10ead,
 0x10eb0, 0x10eb1,
-0x10f00, 0x10f27,
+0x10efd, 0x10f27,
 0x10f30, 0x10f59,
 0x10f70, 0x10f89,
 0x10fb0, 0x10fcb,
@@ -1327,7 +1340,7 @@ CR_Graph[] = { 703,
 0x11180, 0x111df,
 0x111e1, 0x111f4,
 0x11200, 0x11211,
-0x11213, 0x1123e,
+0x11213, 0x11241,
 0x11280, 0x11286,
 0x11288, 0x11288,
 0x1128a, 0x1128d,
@@ -1380,6 +1393,7 @@ CR_Graph[] = { 703,
 0x11a00, 0x11a47,
 0x11a50, 0x11aa2,
 0x11ab0, 0x11af8,
+0x11b00, 0x11b09,
 0x11c00, 0x11c08,
 0x11c0a, 0x11c36,
 0x11c38, 0x11c45,
@@ -1401,6 +1415,9 @@ CR_Graph[] = { 703,
 0x11d93, 0x11d98,
 0x11da0, 0x11da9,
 0x11ee0, 0x11ef8,
+0x11f00, 0x11f10,
+0x11f12, 0x11f3a,
+0x11f3e, 0x11f59,
 0x11fb0, 0x11fb0,
 0x11fc0, 0x11ff1,
 0x11fff, 0x12399,
@@ -1408,8 +1425,7 @@ CR_Graph[] = { 703,
 0x12470, 0x12474,
 0x12480, 0x12543,
 0x12f90, 0x12ff2,
-0x13000, 0x1342e,
-0x13430, 0x13438,
+0x13000, 0x13455,
 0x14400, 0x14646,
 0x16800, 0x16a38,
 0x16a40, 0x16a5e,
@@ -1436,7 +1452,9 @@ CR_Graph[] = { 703,
 0x1aff5, 0x1affb,
 0x1affd, 0x1affe,
 0x1b000, 0x1b122,
+0x1b132, 0x1b132,
 0x1b150, 0x1b152,
+0x1b155, 0x1b155,
 0x1b164, 0x1b167,
 0x1b170, 0x1b2fb,
 0x1bc00, 0x1bc6a,
@@ -1451,6 +1469,7 @@ CR_Graph[] = { 703,
 0x1d100, 0x1d126,
 0x1d129, 0x1d1ea,
 0x1d200, 0x1d245,
+0x1d2c0, 0x1d2d3,
 0x1d2e0, 0x1d2f3,
 0x1d300, 0x1d356,
 0x1d360, 0x1d378,
@@ -1478,11 +1497,14 @@ CR_Graph[] = { 703,
 0x1da9b, 0x1da9f,
 0x1daa1, 0x1daaf,
 0x1df00, 0x1df1e,
+0x1df25, 0x1df2a,
 0x1e000, 0x1e006,
 0x1e008, 0x1e018,
 0x1e01b, 0x1e021,
 0x1e023, 0x1e024,
 0x1e026, 0x1e02a,
+0x1e030, 0x1e06d,
+0x1e08f, 0x1e08f,
 0x1e100, 0x1e12c,
 0x1e130, 0x1e13d,
 0x1e140, 0x1e149,
@@ -1490,6 +1512,7 @@ CR_Graph[] = { 703,
 0x1e290, 0x1e2ae,
 0x1e2c0, 0x1e2f9,
 0x1e2ff, 0x1e2ff,
+0x1e4d0, 0x1e4f9,
 0x1e7e0, 0x1e7e6,
 0x1e7e8, 0x1e7eb,
 0x1e7ed, 0x1e7ee,
@@ -1548,10 +1571,10 @@ CR_Graph[] = { 703,
 0x1f250, 0x1f251,
 0x1f260, 0x1f265,
 0x1f300, 0x1f6d7,
-0x1f6dd, 0x1f6ec,
+0x1f6dc, 0x1f6ec,
 0x1f6f0, 0x1f6fc,
-0x1f700, 0x1f773,
-0x1f780, 0x1f7d8,
+0x1f700, 0x1f776,
+0x1f77b, 0x1f7d9,
 0x1f7e0, 0x1f7eb,
 0x1f7f0, 0x1f7f0,
 0x1f800, 0x1f80b,
@@ -1562,25 +1585,25 @@ CR_Graph[] = { 703,
 0x1f8b0, 0x1f8b1,
 0x1f900, 0x1fa53,
 0x1fa60, 0x1fa6d,
-0x1fa70, 0x1fa74,
-0x1fa78, 0x1fa7c,
-0x1fa80, 0x1fa86,
-0x1fa90, 0x1faac,
-0x1fab0, 0x1faba,
-0x1fac0, 0x1fac5,
-0x1fad0, 0x1fad9,
-0x1fae0, 0x1fae7,
-0x1faf0, 0x1faf6,
+0x1fa70, 0x1fa7c,
+0x1fa80, 0x1fa88,
+0x1fa90, 0x1fabd,
+0x1fabf, 0x1fac5,
+0x1face, 0x1fadb,
+0x1fae0, 0x1fae8,
+0x1faf0, 0x1faf8,
 0x1fb00, 0x1fb92,
 0x1fb94, 0x1fbca,
 0x1fbf0, 0x1fbf9,
 0x20000, 0x2a6df,
-0x2a700, 0x2b738,
+0x2a700, 0x2b739,
 0x2b740, 0x2b81d,
 0x2b820, 0x2cea1,
 0x2ceb0, 0x2ebe0,
+0x2ebf0, 0x2ee5d,
 0x2f800, 0x2fa1d,
 0x30000, 0x3134a,
+0x31350, 0x323af,
 0xe0001, 0xe0001,
 0xe0020, 0xe007f,
 0xe0100, 0xe01ef,
@@ -1590,7 +1613,7 @@ CR_Graph[] = { 703,
 
 /* PROPERTY: 'Lower': POSIX [[:Lower:]] */
 static const OnigCodePoint
-CR_Lower[] = { 668,
+CR_Lower[] = { 671,
 0x0061, 0x007a,
 0x00aa, 0x00aa,
 0x00b5, 0x00b5,
@@ -1867,7 +1890,7 @@ CR_Lower[] = { 668,
 0x052f, 0x052f,
 0x0560, 0x0588,
 0x10d0, 0x10fa,
-0x10fd, 0x10ff,
+0x10fc, 0x10ff,
 0x13f8, 0x13fd,
 0x1c80, 0x1c88,
 0x1d00, 0x1dbf,
@@ -2207,10 +2230,11 @@ CR_Lower[] = { 668,
 0xa7d5, 0xa7d5,
 0xa7d7, 0xa7d7,
 0xa7d9, 0xa7d9,
+0xa7f2, 0xa7f4,
 0xa7f6, 0xa7f6,
 0xa7f8, 0xa7fa,
 0xab30, 0xab5a,
-0xab5c, 0xab68,
+0xab5c, 0xab69,
 0xab70, 0xabbf,
 0xfb00, 0xfb06,
 0xfb13, 0xfb17,
@@ -2258,12 +2282,14 @@ CR_Lower[] = { 668,
 0x1d7cb, 0x1d7cb,
 0x1df00, 0x1df09,
 0x1df0b, 0x1df1e,
+0x1df25, 0x1df2a,
+0x1e030, 0x1e06d,
 0x1e922, 0x1e943,
 }; /* END of CR_Lower */
 
 /* PROPERTY: 'Print': POSIX [[:Print:]] */
 static const OnigCodePoint
-CR_Print[] = { 700,
+CR_Print[] = { 709,
 0x0020, 0x007e,
 0x00a0, 0x0377,
 0x037a, 0x037f,
@@ -2386,7 +2412,7 @@ CR_Print[] = { 700,
 0x0cdd, 0x0cde,
 0x0ce0, 0x0ce3,
 0x0ce6, 0x0cef,
-0x0cf1, 0x0cf2,
+0x0cf1, 0x0cf3,
 0x0d00, 0x0d0c,
 0x0d0e, 0x0d10,
 0x0d12, 0x0d44,
@@ -2416,7 +2442,7 @@ CR_Print[] = { 700,
 0x0ea7, 0x0ebd,
 0x0ec0, 0x0ec4,
 0x0ec6, 0x0ec6,
-0x0ec8, 0x0ecd,
+0x0ec8, 0x0ece,
 0x0ed0, 0x0ed9,
 0x0edc, 0x0edf,
 0x0f00, 0x0f47,
@@ -2535,14 +2561,13 @@ CR_Print[] = { 700,
 0x2e80, 0x2e99,
 0x2e9b, 0x2ef3,
 0x2f00, 0x2fd5,
-0x2ff0, 0x2ffb,
-0x3000, 0x303f,
+0x2ff0, 0x303f,
 0x3041, 0x3096,
 0x3099, 0x30ff,
 0x3105, 0x312f,
 0x3131, 0x318e,
 0x3190, 0x31e3,
-0x31f0, 0x321e,
+0x31ef, 0x321e,
 0x3220, 0xa48c,
 0xa490, 0xa4c6,
 0xa4d0, 0xa62b,
@@ -2688,7 +2713,7 @@ CR_Print[] = { 700,
 0x10e80, 0x10ea9,
 0x10eab, 0x10ead,
 0x10eb0, 0x10eb1,
-0x10f00, 0x10f27,
+0x10efd, 0x10f27,
 0x10f30, 0x10f59,
 0x10f70, 0x10f89,
 0x10fb0, 0x10fcb,
@@ -2705,7 +2730,7 @@ CR_Print[] = { 700,
 0x11180, 0x111df,
 0x111e1, 0x111f4,
 0x11200, 0x11211,
-0x11213, 0x1123e,
+0x11213, 0x11241,
 0x11280, 0x11286,
 0x11288, 0x11288,
 0x1128a, 0x1128d,
@@ -2758,6 +2783,7 @@ CR_Print[] = { 700,
 0x11a00, 0x11a47,
 0x11a50, 0x11aa2,
 0x11ab0, 0x11af8,
+0x11b00, 0x11b09,
 0x11c00, 0x11c08,
 0x11c0a, 0x11c36,
 0x11c38, 0x11c45,
@@ -2779,6 +2805,9 @@ CR_Print[] = { 700,
 0x11d93, 0x11d98,
 0x11da0, 0x11da9,
 0x11ee0, 0x11ef8,
+0x11f00, 0x11f10,
+0x11f12, 0x11f3a,
+0x11f3e, 0x11f59,
 0x11fb0, 0x11fb0,
 0x11fc0, 0x11ff1,
 0x11fff, 0x12399,
@@ -2786,8 +2815,7 @@ CR_Print[] = { 700,
 0x12470, 0x12474,
 0x12480, 0x12543,
 0x12f90, 0x12ff2,
-0x13000, 0x1342e,
-0x13430, 0x13438,
+0x13000, 0x13455,
 0x14400, 0x14646,
 0x16800, 0x16a38,
 0x16a40, 0x16a5e,
@@ -2814,7 +2842,9 @@ CR_Print[] = { 700,
 0x1aff5, 0x1affb,
 0x1affd, 0x1affe,
 0x1b000, 0x1b122,
+0x1b132, 0x1b132,
 0x1b150, 0x1b152,
+0x1b155, 0x1b155,
 0x1b164, 0x1b167,
 0x1b170, 0x1b2fb,
 0x1bc00, 0x1bc6a,
@@ -2829,6 +2859,7 @@ CR_Print[] = { 700,
 0x1d100, 0x1d126,
 0x1d129, 0x1d1ea,
 0x1d200, 0x1d245,
+0x1d2c0, 0x1d2d3,
 0x1d2e0, 0x1d2f3,
 0x1d300, 0x1d356,
 0x1d360, 0x1d378,
@@ -2856,11 +2887,14 @@ CR_Print[] = { 700,
 0x1da9b, 0x1da9f,
 0x1daa1, 0x1daaf,
 0x1df00, 0x1df1e,
+0x1df25, 0x1df2a,
 0x1e000, 0x1e006,
 0x1e008, 0x1e018,
 0x1e01b, 0x1e021,
 0x1e023, 0x1e024,
 0x1e026, 0x1e02a,
+0x1e030, 0x1e06d,
+0x1e08f, 0x1e08f,
 0x1e100, 0x1e12c,
 0x1e130, 0x1e13d,
 0x1e140, 0x1e149,
@@ -2868,6 +2902,7 @@ CR_Print[] = { 700,
 0x1e290, 0x1e2ae,
 0x1e2c0, 0x1e2f9,
 0x1e2ff, 0x1e2ff,
+0x1e4d0, 0x1e4f9,
 0x1e7e0, 0x1e7e6,
 0x1e7e8, 0x1e7eb,
 0x1e7ed, 0x1e7ee,
@@ -2926,10 +2961,10 @@ CR_Print[] = { 700,
 0x1f250, 0x1f251,
 0x1f260, 0x1f265,
 0x1f300, 0x1f6d7,
-0x1f6dd, 0x1f6ec,
+0x1f6dc, 0x1f6ec,
 0x1f6f0, 0x1f6fc,
-0x1f700, 0x1f773,
-0x1f780, 0x1f7d8,
+0x1f700, 0x1f776,
+0x1f77b, 0x1f7d9,
 0x1f7e0, 0x1f7eb,
 0x1f7f0, 0x1f7f0,
 0x1f800, 0x1f80b,
@@ -2940,25 +2975,25 @@ CR_Print[] = { 700,
 0x1f8b0, 0x1f8b1,
 0x1f900, 0x1fa53,
 0x1fa60, 0x1fa6d,
-0x1fa70, 0x1fa74,
-0x1fa78, 0x1fa7c,
-0x1fa80, 0x1fa86,
-0x1fa90, 0x1faac,
-0x1fab0, 0x1faba,
-0x1fac0, 0x1fac5,
-0x1fad0, 0x1fad9,
-0x1fae0, 0x1fae7,
-0x1faf0, 0x1faf6,
+0x1fa70, 0x1fa7c,
+0x1fa80, 0x1fa88,
+0x1fa90, 0x1fabd,
+0x1fabf, 0x1fac5,
+0x1face, 0x1fadb,
+0x1fae0, 0x1fae8,
+0x1faf0, 0x1faf8,
 0x1fb00, 0x1fb92,
 0x1fb94, 0x1fbca,
 0x1fbf0, 0x1fbf9,
 0x20000, 0x2a6df,
-0x2a700, 0x2b738,
+0x2a700, 0x2b739,
 0x2b740, 0x2b81d,
 0x2b820, 0x2cea1,
 0x2ceb0, 0x2ebe0,
+0x2ebf0, 0x2ee5d,
 0x2f800, 0x2fa1d,
 0x30000, 0x3134a,
+0x31350, 0x323af,
 0xe0001, 0xe0001,
 0xe0020, 0xe007f,
 0xe0100, 0xe01ef,
@@ -2966,113 +3001,182 @@ CR_Print[] = { 700,
 0x100000, 0x10fffd,
 }; /* END of CR_Print */
 
-/* PROPERTY: 'Punct': POSIX [[:Punct:]] */
+/* PROPERTY: 'PosixPunct': POSIX [[:punct:]] */
 static const OnigCodePoint
-CR_Punct[] = { 189,
-0x0021, 0x0023,
-0x0025, 0x002a,
-0x002c, 0x002f,
-0x003a, 0x003b,
-0x003f, 0x0040,
-0x005b, 0x005d,
-0x005f, 0x005f,
-0x007b, 0x007b,
-0x007d, 0x007d,
-0x00a1, 0x00a1,
-0x00a7, 0x00a7,
-0x00ab, 0x00ab,
-0x00b6, 0x00b7,
+CR_PosixPunct[] = { 339,
+0x0021, 0x002f,
+0x003a, 0x0040,
+0x005b, 0x0060,
+0x007b, 0x007e,
+0x00a1, 0x00a9,
+0x00ab, 0x00ac,
+0x00ae, 0x00b1,
+0x00b4, 0x00b4,
+0x00b6, 0x00b8,
 0x00bb, 0x00bb,
 0x00bf, 0x00bf,
+0x00d7, 0x00d7,
+0x00f7, 0x00f7,
+0x02c2, 0x02c5,
+0x02d2, 0x02df,
+0x02e5, 0x02eb,
+0x02ed, 0x02ed,
+0x02ef, 0x02ff,
+0x0375, 0x0375,
 0x037e, 0x037e,
+0x0384, 0x0385,
 0x0387, 0x0387,
+0x03f6, 0x03f6,
+0x0482, 0x0482,
 0x055a, 0x055f,
 0x0589, 0x058a,
+0x058d, 0x058f,
 0x05be, 0x05be,
 0x05c0, 0x05c0,
 0x05c3, 0x05c3,
 0x05c6, 0x05c6,
 0x05f3, 0x05f4,
-0x0609, 0x060a,
-0x060c, 0x060d,
+0x0606, 0x060f,
 0x061b, 0x061b,
 0x061d, 0x061f,
 0x066a, 0x066d,
 0x06d4, 0x06d4,
+0x06de, 0x06de,
+0x06e9, 0x06e9,
+0x06fd, 0x06fe,
 0x0700, 0x070d,
-0x07f7, 0x07f9,
+0x07f6, 0x07f9,
+0x07fe, 0x07ff,
 0x0830, 0x083e,
 0x085e, 0x085e,
+0x0888, 0x0888,
 0x0964, 0x0965,
 0x0970, 0x0970,
+0x09f2, 0x09f3,
+0x09fa, 0x09fb,
 0x09fd, 0x09fd,
 0x0a76, 0x0a76,
-0x0af0, 0x0af0,
+0x0af0, 0x0af1,
+0x0b70, 0x0b70,
+0x0bf3, 0x0bfa,
 0x0c77, 0x0c77,
+0x0c7f, 0x0c7f,
 0x0c84, 0x0c84,
+0x0d4f, 0x0d4f,
+0x0d79, 0x0d79,
 0x0df4, 0x0df4,
+0x0e3f, 0x0e3f,
 0x0e4f, 0x0e4f,
 0x0e5a, 0x0e5b,
-0x0f04, 0x0f12,
-0x0f14, 0x0f14,
+0x0f01, 0x0f17,
+0x0f1a, 0x0f1f,
+0x0f34, 0x0f34,
+0x0f36, 0x0f36,
+0x0f38, 0x0f38,
 0x0f3a, 0x0f3d,
 0x0f85, 0x0f85,
-0x0fd0, 0x0fd4,
-0x0fd9, 0x0fda,
+0x0fbe, 0x0fc5,
+0x0fc7, 0x0fcc,
+0x0fce, 0x0fda,
 0x104a, 0x104f,
+0x109e, 0x109f,
 0x10fb, 0x10fb,
 0x1360, 0x1368,
+0x1390, 0x1399,
 0x1400, 0x1400,
-0x166e, 0x166e,
+0x166d, 0x166e,
 0x169b, 0x169c,
 0x16eb, 0x16ed,
 0x1735, 0x1736,
 0x17d4, 0x17d6,
-0x17d8, 0x17da,
+0x17d8, 0x17db,
 0x1800, 0x180a,
+0x1940, 0x1940,
 0x1944, 0x1945,
+0x19de, 0x19ff,
 0x1a1e, 0x1a1f,
 0x1aa0, 0x1aa6,
 0x1aa8, 0x1aad,
-0x1b5a, 0x1b60,
-0x1b7d, 0x1b7e,
+0x1b5a, 0x1b6a,
+0x1b74, 0x1b7e,
 0x1bfc, 0x1bff,
 0x1c3b, 0x1c3f,
 0x1c7e, 0x1c7f,
 0x1cc0, 0x1cc7,
 0x1cd3, 0x1cd3,
+0x1fbd, 0x1fbd,
+0x1fbf, 0x1fc1,
+0x1fcd, 0x1fcf,
+0x1fdd, 0x1fdf,
+0x1fed, 0x1fef,
+0x1ffd, 0x1ffe,
 0x2010, 0x2027,
-0x2030, 0x2043,
-0x2045, 0x2051,
-0x2053, 0x205e,
-0x207d, 0x207e,
-0x208d, 0x208e,
-0x2308, 0x230b,
-0x2329, 0x232a,
-0x2768, 0x2775,
-0x27c5, 0x27c6,
-0x27e6, 0x27ef,
-0x2983, 0x2998,
-0x29d8, 0x29db,
-0x29fc, 0x29fd,
+0x2030, 0x205e,
+0x207a, 0x207e,
+0x208a, 0x208e,
+0x20a0, 0x20c0,
+0x2100, 0x2101,
+0x2103, 0x2106,
+0x2108, 0x2109,
+0x2114, 0x2114,
+0x2116, 0x2118,
+0x211e, 0x2123,
+0x2125, 0x2125,
+0x2127, 0x2127,
+0x2129, 0x2129,
+0x212e, 0x212e,
+0x213a, 0x213b,
+0x2140, 0x2144,
+0x214a, 0x214d,
+0x214f, 0x214f,
+0x218a, 0x218b,
+0x2190, 0x2426,
+0x2440, 0x244a,
+0x249c, 0x24e9,
+0x2500, 0x2775,
+0x2794, 0x2b73,
+0x2b76, 0x2b95,
+0x2b97, 0x2bff,
+0x2ce5, 0x2cea,
 0x2cf9, 0x2cfc,
 0x2cfe, 0x2cff,
 0x2d70, 0x2d70,
 0x2e00, 0x2e2e,
-0x2e30, 0x2e4f,
-0x2e52, 0x2e5d,
-0x3001, 0x3003,
-0x3008, 0x3011,
-0x3014, 0x301f,
+0x2e30, 0x2e5d,
+0x2e80, 0x2e99,
+0x2e9b, 0x2ef3,
+0x2f00, 0x2fd5,
+0x2ff0, 0x2fff,
+0x3001, 0x3004,
+0x3008, 0x3020,
 0x3030, 0x3030,
-0x303d, 0x303d,
+0x3036, 0x3037,
+0x303d, 0x303f,
+0x309b, 0x309c,
 0x30a0, 0x30a0,
 0x30fb, 0x30fb,
+0x3190, 0x3191,
+0x3196, 0x319f,
+0x31c0, 0x31e3,
+0x31ef, 0x31ef,
+0x3200, 0x321e,
+0x322a, 0x3247,
+0x3250, 0x3250,
+0x3260, 0x327f,
+0x328a, 0x32b0,
+0x32c0, 0x33ff,
+0x4dc0, 0x4dff,
+0xa490, 0xa4c6,
 0xa4fe, 0xa4ff,
 0xa60d, 0xa60f,
 0xa673, 0xa673,
 0xa67e, 0xa67e,
 0xa6f2, 0xa6f7,
+0xa700, 0xa716,
+0xa720, 0xa721,
+0xa789, 0xa78a,
+0xa828, 0xa82b,
+0xa836, 0xa839,
 0xa874, 0xa877,
 0xa8ce, 0xa8cf,
 0xa8f8, 0xa8fa,
@@ -3082,35 +3186,45 @@ CR_Punct[] = { 189,
 0xa9c1, 0xa9cd,
 0xa9de, 0xa9df,
 0xaa5c, 0xaa5f,
+0xaa77, 0xaa79,
 0xaade, 0xaadf,
 0xaaf0, 0xaaf1,
+0xab5b, 0xab5b,
+0xab6a, 0xab6b,
 0xabeb, 0xabeb,
-0xfd3e, 0xfd3f,
+0xfb29, 0xfb29,
+0xfbb2, 0xfbc2,
+0xfd3e, 0xfd4f,
+0xfdcf, 0xfdcf,
+0xfdfc, 0xfdff,
 0xfe10, 0xfe19,
 0xfe30, 0xfe52,
-0xfe54, 0xfe61,
-0xfe63, 0xfe63,
-0xfe68, 0xfe68,
-0xfe6a, 0xfe6b,
-0xff01, 0xff03,
-0xff05, 0xff0a,
-0xff0c, 0xff0f,
-0xff1a, 0xff1b,
-0xff1f, 0xff20,
-0xff3b, 0xff3d,
-0xff3f, 0xff3f,
-0xff5b, 0xff5b,
-0xff5d, 0xff5d,
-0xff5f, 0xff65,
+0xfe54, 0xfe66,
+0xfe68, 0xfe6b,
+0xff01, 0xff0f,
+0xff1a, 0xff20,
+0xff3b, 0xff40,
+0xff5b, 0xff65,
+0xffe0, 0xffe6,
+0xffe8, 0xffee,
+0xfffc, 0xfffd,
 0x10100, 0x10102,
+0x10137, 0x1013f,
+0x10179, 0x10189,
+0x1018c, 0x1018e,
+0x10190, 0x1019c,
+0x101a0, 0x101a0,
+0x101d0, 0x101fc,
 0x1039f, 0x1039f,
 0x103d0, 0x103d0,
 0x1056f, 0x1056f,
 0x10857, 0x10857,
+0x10877, 0x10878,
 0x1091f, 0x1091f,
 0x1093f, 0x1093f,
 0x10a50, 0x10a58,
 0x10a7f, 0x10a7f,
+0x10ac8, 0x10ac8,
 0x10af0, 0x10af6,
 0x10b39, 0x10b3f,
 0x10b99, 0x10b9c,
@@ -3136,29 +3250,100 @@ CR_Punct[] = { 189,
 0x11641, 0x11643,
 0x11660, 0x1166c,
 0x116b9, 0x116b9,
-0x1173c, 0x1173e,
+0x1173c, 0x1173f,
 0x1183b, 0x1183b,
 0x11944, 0x11946,
 0x119e2, 0x119e2,
 0x11a3f, 0x11a46,
 0x11a9a, 0x11a9c,
 0x11a9e, 0x11aa2,
+0x11b00, 0x11b09,
 0x11c41, 0x11c45,
 0x11c70, 0x11c71,
 0x11ef7, 0x11ef8,
+0x11f43, 0x11f4f,
+0x11fd5, 0x11ff1,
 0x11fff, 0x11fff,
 0x12470, 0x12474,
 0x12ff1, 0x12ff2,
 0x16a6e, 0x16a6f,
 0x16af5, 0x16af5,
-0x16b37, 0x16b3b,
-0x16b44, 0x16b44,
+0x16b37, 0x16b3f,
+0x16b44, 0x16b45,
 0x16e97, 0x16e9a,
 0x16fe2, 0x16fe2,
+0x1bc9c, 0x1bc9c,
 0x1bc9f, 0x1bc9f,
-0x1da87, 0x1da8b,
+0x1cf50, 0x1cfc3,
+0x1d000, 0x1d0f5,
+0x1d100, 0x1d126,
+0x1d129, 0x1d164,
+0x1d16a, 0x1d16c,
+0x1d183, 0x1d184,
+0x1d18c, 0x1d1a9,
+0x1d1ae, 0x1d1ea,
+0x1d200, 0x1d241,
+0x1d245, 0x1d245,
+0x1d300, 0x1d356,
+0x1d6c1, 0x1d6c1,
+0x1d6db, 0x1d6db,
+0x1d6fb, 0x1d6fb,
+0x1d715, 0x1d715,
+0x1d735, 0x1d735,
+0x1d74f, 0x1d74f,
+0x1d76f, 0x1d76f,
+0x1d789, 0x1d789,
+0x1d7a9, 0x1d7a9,
+0x1d7c3, 0x1d7c3,
+0x1d800, 0x1d9ff,
+0x1da37, 0x1da3a,
+0x1da6d, 0x1da74,
+0x1da76, 0x1da83,
+0x1da85, 0x1da8b,
+0x1e14f, 0x1e14f,
+0x1e2ff, 0x1e2ff,
 0x1e95e, 0x1e95f,
-}; /* END of CR_Punct */
+0x1ecac, 0x1ecac,
+0x1ecb0, 0x1ecb0,
+0x1ed2e, 0x1ed2e,
+0x1eef0, 0x1eef1,
+0x1f000, 0x1f02b,
+0x1f030, 0x1f093,
+0x1f0a0, 0x1f0ae,
+0x1f0b1, 0x1f0bf,
+0x1f0c1, 0x1f0cf,
+0x1f0d1, 0x1f0f5,
+0x1f10d, 0x1f1ad,
+0x1f1e6, 0x1f202,
+0x1f210, 0x1f23b,
+0x1f240, 0x1f248,
+0x1f250, 0x1f251,
+0x1f260, 0x1f265,
+0x1f300, 0x1f6d7,
+0x1f6dc, 0x1f6ec,
+0x1f6f0, 0x1f6fc,
+0x1f700, 0x1f776,
+0x1f77b, 0x1f7d9,
+0x1f7e0, 0x1f7eb,
+0x1f7f0, 0x1f7f0,
+0x1f800, 0x1f80b,
+0x1f810, 0x1f847,
+0x1f850, 0x1f859,
+0x1f860, 0x1f887,
+0x1f890, 0x1f8ad,
+0x1f8b0, 0x1f8b1,
+0x1f900, 0x1fa53,
+0x1fa60, 0x1fa6d,
+0x1fa70, 0x1fa7c,
+0x1fa80, 0x1fa88,
+0x1fa90, 0x1fabd,
+0x1fabf, 0x1fac5,
+0x1face, 0x1fadb,
+0x1fae0, 0x1fae8,
+0x1faf0, 0x1faf8,
+0x1fb00, 0x1fb92,
+0x1fb94, 0x1fbca,
+}; /* END of CR_PosixPunct */
 
 /* PROPERTY: 'Space': POSIX [[:Space:]] */
 static const OnigCodePoint
@@ -3841,7 +4026,7 @@ CR_XDigit[] = { 3,
 
 /* PROPERTY: 'Word': POSIX [[:Word:]] */
 static const OnigCodePoint
-CR_Word[] = { 758,
+CR_Word[] = { 771,
 0x0030, 0x0039,
 0x0041, 0x005a,
 0x005f, 0x005f,
@@ -3999,7 +4184,7 @@ CR_Word[] = { 758,
 0x0cdd, 0x0cde,
 0x0ce0, 0x0ce3,
 0x0ce6, 0x0cef,
-0x0cf1, 0x0cf2,
+0x0cf1, 0x0cf3,
 0x0d00, 0x0d0c,
 0x0d0e, 0x0d10,
 0x0d12, 0x0d44,
@@ -4032,7 +4217,7 @@ CR_Word[] = { 758,
 0x0ea7, 0x0ebd,
 0x0ec0, 0x0ec4,
 0x0ec6, 0x0ec6,
-0x0ec8, 0x0ecd,
+0x0ec8, 0x0ece,
 0x0ed0, 0x0ed9,
 0x0edc, 0x0edf,
 0x0f00, 0x0f00,
@@ -4345,7 +4530,7 @@ CR_Word[] = { 758,
 0x10e80, 0x10ea9,
 0x10eab, 0x10eac,
 0x10eb0, 0x10eb1,
-0x10f00, 0x10f1c,
+0x10efd, 0x10f1c,
 0x10f27, 0x10f27,
 0x10f30, 0x10f50,
 0x10f70, 0x10f85,
@@ -4368,7 +4553,7 @@ CR_Word[] = { 758,
 0x111dc, 0x111dc,
 0x11200, 0x11211,
 0x11213, 0x11237,
-0x1123e, 0x1123e,
+0x1123e, 0x11241,
 0x11280, 0x11286,
 0x11288, 0x11288,
 0x1128a, 0x1128d,
@@ -4449,12 +4634,17 @@ CR_Word[] = { 758,
 0x11d93, 0x11d98,
 0x11da0, 0x11da9,
 0x11ee0, 0x11ef6,
+0x11f00, 0x11f10,
+0x11f12, 0x11f3a,
+0x11f3e, 0x11f42,
+0x11f50, 0x11f59,
 0x11fb0, 0x11fb0,
 0x12000, 0x12399,
 0x12400, 0x1246e,
 0x12480, 0x12543,
 0x12f90, 0x12ff0,
-0x13000, 0x1342e,
+0x13000, 0x1342f,
+0x13440, 0x13455,
 0x14400, 0x14646,
 0x16800, 0x16a38,
 0x16a40, 0x16a5e,
@@ -4482,7 +4672,9 @@ CR_Word[] = { 758,
 0x1aff5, 0x1affb,
 0x1affd, 0x1affe,
 0x1b000, 0x1b122,
+0x1b132, 0x1b132,
 0x1b150, 0x1b152,
+0x1b155, 0x1b155,
 0x1b164, 0x1b167,
 0x1b170, 0x1b2fb,
 0x1bc00, 0x1bc6a,
@@ -4536,17 +4728,21 @@ CR_Word[] = { 758,
 0x1da9b, 0x1da9f,
 0x1daa1, 0x1daaf,
 0x1df00, 0x1df1e,
+0x1df25, 0x1df2a,
 0x1e000, 0x1e006,
 0x1e008, 0x1e018,
 0x1e01b, 0x1e021,
 0x1e023, 0x1e024,
 0x1e026, 0x1e02a,
+0x1e030, 0x1e06d,
+0x1e08f, 0x1e08f,
 0x1e100, 0x1e12c,
 0x1e130, 0x1e13d,
 0x1e140, 0x1e149,
 0x1e14e, 0x1e14e,
 0x1e290, 0x1e2ae,
 0x1e2c0, 0x1e2f9,
+0x1e4d0, 0x1e4f9,
 0x1e7e0, 0x1e7e6,
 0x1e7e8, 0x1e7eb,
 0x1e7ed, 0x1e7ee,
@@ -4593,18 +4789,20 @@ CR_Word[] = { 758,
 0x1f170, 0x1f189,
 0x1fbf0, 0x1fbf9,
 0x20000, 0x2a6df,
-0x2a700, 0x2b738,
+0x2a700, 0x2b739,
 0x2b740, 0x2b81d,
 0x2b820, 0x2cea1,
 0x2ceb0, 0x2ebe0,
+0x2ebf0, 0x2ee5d,
 0x2f800, 0x2fa1d,
 0x30000, 0x3134a,
+0x31350, 0x323af,
 0xe0100, 0xe01ef,
 }; /* END of CR_Word */
 
 /* PROPERTY: 'Alnum': POSIX [[:Alnum:]] */
 static const OnigCodePoint
-CR_Alnum[] = { 760,
+CR_Alnum[] = { 773,
 0x0030, 0x0039,
 0x0041, 0x005a,
 0x0061, 0x007a,
@@ -4743,8 +4941,7 @@ CR_Alnum[] = { 760,
 0x0bd0, 0x0bd0,
 0x0bd7, 0x0bd7,
 0x0be6, 0x0bef,
-0x0c00, 0x0c03,
-0x0c05, 0x0c0c,
+0x0c00, 0x0c0c,
 0x0c0e, 0x0c10,
 0x0c12, 0x0c28,
 0x0c2a, 0x0c39,
@@ -4769,7 +4966,7 @@ CR_Alnum[] = { 760,
 0x0cdd, 0x0cde,
 0x0ce0, 0x0ce3,
 0x0ce6, 0x0cef,
-0x0cf1, 0x0cf2,
+0x0cf1, 0x0cf3,
 0x0d00, 0x0d0c,
 0x0d0e, 0x0d10,
 0x0d12, 0x0d3a,
@@ -4812,7 +5009,7 @@ CR_Alnum[] = { 760,
 0x0f20, 0x0f29,
 0x0f40, 0x0f47,
 0x0f49, 0x0f6c,
-0x0f71, 0x0f81,
+0x0f71, 0x0f83,
 0x0f88, 0x0f97,
 0x0f99, 0x0fbc,
 0x1000, 0x1036,
@@ -5122,7 +5319,7 @@ CR_Alnum[] = { 760,
 0x11000, 0x11045,
 0x11066, 0x1106f,
 0x11071, 0x11075,
-0x11082, 0x110b8,
+0x11080, 0x110b8,
 0x110c2, 0x110c2,
 0x110d0, 0x110e8,
 0x110f0, 0x110f9,
@@ -5138,7 +5335,7 @@ CR_Alnum[] = { 760,
 0x11200, 0x11211,
 0x11213, 0x11234,
 0x11237, 0x11237,
-0x1123e, 0x1123e,
+0x1123e, 0x11241,
 0x11280, 0x11286,
 0x11288, 0x11288,
 0x1128a, 0x1128d,
@@ -5228,12 +5425,17 @@ CR_Alnum[] = { 760,
 0x11d98, 0x11d98,
 0x11da0, 0x11da9,
 0x11ee0, 0x11ef6,
+0x11f00, 0x11f10,
+0x11f12, 0x11f3a,
+0x11f3e, 0x11f40,
+0x11f50, 0x11f59,
 0x11fb0, 0x11fb0,
 0x12000, 0x12399,
 0x12400, 0x1246e,
 0x12480, 0x12543,
 0x12f90, 0x12ff0,
-0x13000, 0x1342e,
+0x13000, 0x1342f,
+0x13441, 0x13446,
 0x14400, 0x14646,
 0x16800, 0x16a38,
 0x16a40, 0x16a5e,
@@ -5260,7 +5462,9 @@ CR_Alnum[] = { 760,
 0x1aff5, 0x1affb,
 0x1affd, 0x1affe,
 0x1b000, 0x1b122,
+0x1b132, 0x1b132,
 0x1b150, 0x1b152,
+0x1b155, 0x1b155,
 0x1b164, 0x1b167,
 0x1b170, 0x1b2fb,
 0x1bc00, 0x1bc6a,
@@ -5300,11 +5504,14 @@ CR_Alnum[] = { 760,
 0x1d7c4, 0x1d7cb,
 0x1d7ce, 0x1d7ff,
 0x1df00, 0x1df1e,
+0x1df25, 0x1df2a,
 0x1e000, 0x1e006,
 0x1e008, 0x1e018,
 0x1e01b, 0x1e021,
 0x1e023, 0x1e024,
 0x1e026, 0x1e02a,
+0x1e030, 0x1e06d,
+0x1e08f, 0x1e08f,
 0x1e100, 0x1e12c,
 0x1e137, 0x1e13d,
 0x1e140, 0x1e149,
@@ -5312,6 +5519,8 @@ CR_Alnum[] = { 760,
 0x1e290, 0x1e2ad,
 0x1e2c0, 0x1e2eb,
 0x1e2f0, 0x1e2f9,
+0x1e4d0, 0x1e4eb,
+0x1e4f0, 0x1e4f9,
 0x1e7e0, 0x1e7e6,
 0x1e7e8, 0x1e7eb,
 0x1e7ed, 0x1e7ee,
@@ -5359,12 +5568,14 @@ CR_Alnum[] = { 760,
 0x1f170, 0x1f189,
 0x1fbf0, 0x1fbf9,
 0x20000, 0x2a6df,
-0x2a700, 0x2b738,
+0x2a700, 0x2b739,
 0x2b740, 0x2b81d,
 0x2b820, 0x2cea1,
 0x2ceb0, 0x2ebe0,
+0x2ebf0, 0x2ee5d,
 0x2f800, 0x2fa1d,
 0x30000, 0x3134a,
+0x31350, 0x323af,
 }; /* END of CR_Alnum */
 
 /* PROPERTY: 'ASCII': POSIX [[:ASCII:]] */
@@ -5384,7 +5595,7 @@ const CodeRanges[] = {
   CR_Graph,
   CR_Lower,
   CR_Print,
-  CR_Punct,
+  CR_PosixPunct,
   CR_Space,
   CR_Upper,
   CR_XDigit,
@@ -5398,7 +5609,7 @@ const CodeRanges[] = {
 
 #define TOTAL_KEYWORDS 15
 #define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 7
+#define MAX_WORD_LENGTH 10
 #define MIN_HASH_VALUE 5
 #define MAX_HASH_VALUE 19
 /* maximum key range = 15, duplicates = 0 */
@@ -5466,13 +5677,13 @@ hash (register const char *str, register size_t len)
       20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
       20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
       20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20,  2, 12,  5,  3, 20,
-      20, 10, 20,  0, 20, 20,  9, 20,  1, 20,
-       0, 20,  9,  7,  3,  6, 20,  2,  3, 20,
-      20, 20, 20, 20, 20, 20, 20,  2, 12,  5,
-       3, 20, 20, 10, 20,  0, 20, 20,  9, 20,
-       1, 20,  0, 20,  9,  7,  3,  6, 20,  2,
-       3, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20,  0, 14,  8,  1, 20,
+      20, 12, 20,  1, 20, 20, 10, 20,  4, 20,
+       1, 20, 10,  0,  1,  4, 20,  1,  1, 20,
+      20, 20, 20, 20, 20, 20, 20,  0, 14,  8,
+       1, 20, 20, 12, 20,  1, 20, 20, 10, 20,
+       4, 20,  1, 20, 10,  0,  1,  4, 20,  1,
+       1, 20, 20, 20, 20, 20, 20, 20, 20, 20,
       20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
       20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
       20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
@@ -5492,16 +5703,16 @@ hash (register const char *str, register size_t len)
 
 struct unicode_prop_name_pool_t
   {
-    char unicode_prop_name_pool_str5[sizeof("print")];
-    char unicode_prop_name_pool_str6[sizeof("punct")];
-    char unicode_prop_name_pool_str7[sizeof("alpha")];
-    char unicode_prop_name_pool_str8[sizeof("alnum")];
-    char unicode_prop_name_pool_str9[sizeof("xdigit")];
-    char unicode_prop_name_pool_str10[sizeof("newline")];
-    char unicode_prop_name_pool_str11[sizeof("upper")];
-    char unicode_prop_name_pool_str12[sizeof("ascii")];
-    char unicode_prop_name_pool_str13[sizeof("cntrl")];
-    char unicode_prop_name_pool_str14[sizeof("space")];
+    char unicode_prop_name_pool_str5[sizeof("space")];
+    char unicode_prop_name_pool_str6[sizeof("alpha")];
+    char unicode_prop_name_pool_str7[sizeof("print")];
+    char unicode_prop_name_pool_str8[sizeof("xdigit")];
+    char unicode_prop_name_pool_str9[sizeof("alnum")];
+    char unicode_prop_name_pool_str10[sizeof("upper")];
+    char unicode_prop_name_pool_str11[sizeof("posixpunct")];
+    char unicode_prop_name_pool_str12[sizeof("newline")];
+    char unicode_prop_name_pool_str13[sizeof("ascii")];
+    char unicode_prop_name_pool_str14[sizeof("cntrl")];
     char unicode_prop_name_pool_str15[sizeof("word")];
     char unicode_prop_name_pool_str16[sizeof("lower")];
     char unicode_prop_name_pool_str17[sizeof("graph")];
@@ -5510,16 +5721,16 @@ struct unicode_prop_name_pool_t
   };
 static const struct unicode_prop_name_pool_t unicode_prop_name_pool_contents =
   {
-    "print",
-    "punct",
+    "space",
     "alpha",
-    "alnum",
+    "print",
     "xdigit",
-    "newline",
+    "alnum",
     "upper",
+    "posixpunct",
+    "newline",
     "ascii",
     "cntrl",
-    "space",
     "word",
     "lower",
     "graph",
@@ -5534,25 +5745,25 @@ unicode_lookup_property_name (register const char *str, register size_t len)
     {
       {-1}, {-1}, {-1}, {-1}, {-1},
 
-      {pool_offset(5),                                7},
+      {pool_offset(5),                                9},
 
-      {pool_offset(6),                                8},
+      {pool_offset(6),                                1},
 
-      {pool_offset(7),                                1},
+      {pool_offset(7),                                7},
 
-      {pool_offset(8),                               13},
+      {pool_offset(8),                              11},
 
-      {pool_offset(9),                              11},
+      {pool_offset(9),                               13},
 
-      {pool_offset(10),                              0},
+      {pool_offset(10),                               10},
 
-      {pool_offset(11),                               10},
+      {pool_offset(11),                           8},
 
-      {pool_offset(12),                               14},
+      {pool_offset(12),                              0},
 
-      {pool_offset(13),                                3},
+      {pool_offset(13),                               14},
 
-      {pool_offset(14),                                9},
+      {pool_offset(14),                                3},
 
       {pool_offset(15),                                12},
 
@@ -5586,7 +5797,7 @@ unicode_lookup_property_name (register const char *str, register size_t len)
 
 
 
-#define PROPERTY_NAME_MAX_SIZE  17
+#define PROPERTY_NAME_MAX_SIZE  20
 #define CODE_RANGES_NUM         15
 
 #define PROP_INDEX_NEWLINE 0
@@ -5597,7 +5808,7 @@ unicode_lookup_property_name (register const char *str, register size_t len)
 #define PROP_INDEX_GRAPH 5
 #define PROP_INDEX_LOWER 6
 #define PROP_INDEX_PRINT 7
-#define PROP_INDEX_PUNCT 8
+#define PROP_INDEX_POSIXPUNCT 8
 #define PROP_INDEX_SPACE 9
 #define PROP_INDEX_UPPER 10
 #define PROP_INDEX_XDIGIT 11