To: vim-dev@vim.org Subject: Patch 6.1.442 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.442 Problem: Unicode 3.2 defines more space and punctuation characters. Solution: Add the new characters to the Unicode tables. (Raphael Finkel) Files: src/mbyte.c *** ../vim61.441/src/mbyte.c Wed Mar 26 22:18:13 2003 --- src/mbyte.c Wed Mar 26 19:53:37 2003 *************** *** 1519,1547 **** {0x0387, 0x0387, 1}, /* Greek ano teleia */ {0x055a, 0x055f, 1}, /* Armenian punctuation */ {0x0589, 0x0589, 1}, /* Armenian full stop */ {0x0700, 0x070d, 1}, /* Syriac punctuation */ {0x104a, 0x104f, 1}, /* Myanmar punctuation */ {0x10fb, 0x10fb, 1}, /* Georgian punctuation */ {0x1361, 0x1368, 1}, /* Ethiopic punctuation */ {0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */ {0x17d4, 0x17dc, 1}, /* Khmer punctuation */ {0x1800, 0x180a, 1}, /* Mongolian punctuation */ ! {0x2000, 0x200a, 0}, /* spaces */ ! {0x200b, 0x27ff, 1}, /* punctuation and symbols */ {0x2070, 0x207f, 0x2070}, /* superscript */ {0x2080, 0x208f, 0x2080}, /* subscript */ {0x3000, 0x3000, 0}, /* ideographic space */ {0x3001, 0x3020, 1}, /* ideographic punctuation */ {0x3040, 0x309f, 0x3040}, /* Hiragana */ {0x30a0, 0x30ff, 0x30a0}, /* Katakana */ {0x3300, 0x9fff, 0x4e00}, /* CJK Ideographs */ {0xac00, 0xd7a3, 0xac00}, /* Hangul Syllables */ {0xf900, 0xfaff, 0x4e00}, /* CJK Ideographs */ {0xfe30, 0xfe6b, 1}, /* punctuation forms */ {0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */ {0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */ {0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */ ! {0xff5b, 0xff64, 1}, /* half/fullwidth ASCII */ }; int bot = 0; int top = sizeof(classes) / sizeof(struct interval) - 1; --- 1519,1580 ---- {0x0387, 0x0387, 1}, /* Greek ano teleia */ {0x055a, 0x055f, 1}, /* Armenian punctuation */ {0x0589, 0x0589, 1}, /* Armenian full stop */ + {0x05be, 0x05be, 1}, + {0x05c0, 0x05c0, 1}, + {0x05c3, 0x05c3, 1}, + {0x05f3, 0x05f4, 1}, + {0x060c, 0x060c, 1}, + {0x061b, 0x061b, 1}, + {0x061f, 0x061f, 1}, + {0x066a, 0x066d, 1}, + {0x06d4, 0x06d4, 1}, {0x0700, 0x070d, 1}, /* Syriac punctuation */ + {0x0964, 0x0965, 1}, + {0x0970, 0x0970, 1}, + {0x0df4, 0x0df4, 1}, + {0x0e4f, 0x0e4f, 1}, + {0x0e5a, 0x0e5b, 1}, + {0x0f04, 0x0f12, 1}, + {0x0f3a, 0x0f3d, 1}, + {0x0f85, 0x0f85, 1}, {0x104a, 0x104f, 1}, /* Myanmar punctuation */ {0x10fb, 0x10fb, 1}, /* Georgian punctuation */ {0x1361, 0x1368, 1}, /* Ethiopic punctuation */ {0x166d, 0x166e, 1}, /* Canadian Syl. punctuation */ + {0x1680, 0x1680, 0}, + {0x169b, 0x169c, 1}, + {0x16eb, 0x16ed, 1}, + {0x1735, 0x1736, 1}, {0x17d4, 0x17dc, 1}, /* Khmer punctuation */ {0x1800, 0x180a, 1}, /* Mongolian punctuation */ ! {0x2000, 0x200b, 0}, /* spaces */ ! {0x200c, 0x2027, 1}, /* punctuation and symbols */ ! {0x2028, 0x2029, 0}, ! {0x202a, 0x202e, 1}, /* punctuation and symbols */ ! {0x202f, 0x202f, 0}, ! {0x2030, 0x205e, 1}, /* punctuation and symbols */ ! {0x205f, 0x205f, 0}, ! {0x2060, 0x27ff, 1}, /* punctuation and symbols */ {0x2070, 0x207f, 0x2070}, /* superscript */ {0x2080, 0x208f, 0x2080}, /* subscript */ + {0x2983, 0x2998, 1}, + {0x29d8, 0x29db, 1}, + {0x29fc, 0x29fd, 1}, {0x3000, 0x3000, 0}, /* ideographic space */ {0x3001, 0x3020, 1}, /* ideographic punctuation */ + {0x3030, 0x3030, 1}, + {0x303d, 0x303d, 1}, {0x3040, 0x309f, 0x3040}, /* Hiragana */ {0x30a0, 0x30ff, 0x30a0}, /* Katakana */ {0x3300, 0x9fff, 0x4e00}, /* CJK Ideographs */ {0xac00, 0xd7a3, 0xac00}, /* Hangul Syllables */ {0xf900, 0xfaff, 0x4e00}, /* CJK Ideographs */ + {0xfd3e, 0xfd3f, 1}, {0xfe30, 0xfe6b, 1}, /* punctuation forms */ {0xff00, 0xff0f, 1}, /* half/fullwidth ASCII */ {0xff1a, 0xff20, 1}, /* half/fullwidth ASCII */ {0xff3b, 0xff40, 1}, /* half/fullwidth ASCII */ ! {0xff5b, 0xff65, 1}, /* half/fullwidth ASCII */ }; int bot = 0; int top = sizeof(classes) / sizeof(struct interval) - 1; *************** *** 1705,1725 **** {0x1b3,0x1b5,2,1}, {0x1b7,0x1b7,-1,219}, {0x1b8,0x1bc,4,1}, {0x1c4,0x1ca,3,2}, {0x1cd,0x1db,2,1}, {0x1de,0x1ee,2,1}, {0x1f1,0x1f1,-1,2}, {0x1f4,0x1f4,-1,1}, {0x1f6,0x1f6,-1,-97}, ! {0x1f7,0x1f7,-1,-56}, {0x1f8,0x21e,2,1}, {0x222,0x232,2,1}, ! {0x386,0x386,-1,38}, {0x388,0x38a,1,37}, {0x38c,0x38c,-1,64}, ! {0x38e,0x38f,1,63}, {0x391,0x3a1,1,32}, {0x3a3,0x3ab,1,32}, ! {0x3da,0x3ee,2,1}, {0x3f4,0x3f4,-1,-60}, {0x400,0x40f,1,80}, ! {0x410,0x42f,1,32}, {0x460,0x480,2,1}, {0x48c,0x4be,2,1}, ! {0x4c1,0x4c3,2,1}, {0x4c7,0x4cb,4,1}, {0x4d0,0x4f4,2,1}, ! {0x4f8,0x4f8,-1,1}, {0x531,0x556,1,48}, {0x1e00,0x1e94,2,1}, ! {0x1ea0,0x1ef8,2,1}, {0x1f08,0x1f0f,1,-8}, {0x1f18,0x1f1d,1,-8}, ! {0x1f28,0x1f2f,1,-8}, {0x1f38,0x1f3f,1,-8}, {0x1f48,0x1f4d,1,-8}, ! {0x1f59,0x1f5f,2,-8}, {0x1f68,0x1f6f,1,-8}, {0x1fb8,0x1fb9,1,-8}, ! {0x1fba,0x1fbb,1,-74}, {0x1fc8,0x1fcb,1,-86}, {0x1fd8,0x1fd9,1,-8}, ! {0x1fda,0x1fdb,1,-100}, {0x1fe8,0x1fe9,1,-8}, {0x1fea,0x1feb,1,-112}, ! {0x1fec,0x1fec,-1,-7}, {0x1ff8,0x1ff9,1,-128}, {0x1ffa,0x1ffb,1,-126}, ! {0x2126,0x2126,-1,-7517}, {0x212a,0x212a,-1,-8383}, ! {0x212b,0x212b,-1,-8262}, {0xff21,0xff3a,1,32}, {0x10400,0x10425,1,40} }; convertStruct toUpper[] = --- 1738,1759 ---- {0x1b3,0x1b5,2,1}, {0x1b7,0x1b7,-1,219}, {0x1b8,0x1bc,4,1}, {0x1c4,0x1ca,3,2}, {0x1cd,0x1db,2,1}, {0x1de,0x1ee,2,1}, {0x1f1,0x1f1,-1,2}, {0x1f4,0x1f4,-1,1}, {0x1f6,0x1f6,-1,-97}, ! {0x1f7,0x1f7,-1,-56}, {0x1f8,0x21e,2,1}, {0x220,0x220,-1,-130}, ! {0x222,0x232,2,1}, {0x386,0x386,-1,38}, {0x388,0x38a,1,37}, ! {0x38c,0x38c,-1,64}, {0x38e,0x38f,1,63}, {0x391,0x3a1,1,32}, ! {0x3a3,0x3ab,1,32}, {0x3d8,0x3ee,2,1}, {0x3f4,0x3f4,-1,-60}, ! {0x400,0x40f,1,80}, {0x410,0x42f,1,32}, {0x460,0x480,2,1}, ! {0x48a,0x4be,2,1}, {0x4c1,0x4cd,2,1}, {0x4d0,0x4f4,2,1}, ! {0x4f8,0x500,8,1}, {0x502,0x50e,2,1}, {0x531,0x556,1,48}, ! {0x1e00,0x1e94,2,1}, {0x1ea0,0x1ef8,2,1}, {0x1f08,0x1f0f,1,-8}, ! {0x1f18,0x1f1d,1,-8}, {0x1f28,0x1f2f,1,-8}, {0x1f38,0x1f3f,1,-8}, ! {0x1f48,0x1f4d,1,-8}, {0x1f59,0x1f5f,2,-8}, {0x1f68,0x1f6f,1,-8}, ! {0x1fb8,0x1fb9,1,-8}, {0x1fba,0x1fbb,1,-74}, {0x1fc8,0x1fcb,1,-86}, ! {0x1fd8,0x1fd9,1,-8}, {0x1fda,0x1fdb,1,-100}, {0x1fe8,0x1fe9,1,-8}, ! {0x1fea,0x1feb,1,-112}, {0x1fec,0x1fec,-1,-7}, {0x1ff8,0x1ff9,1,-128}, ! {0x1ffa,0x1ffb,1,-126}, {0x2126,0x2126,-1,-7517}, ! {0x212a,0x212a,-1,-8383}, {0x212b,0x212b,-1,-8262}, ! {0xff21,0xff3a,1,32}, {0x10400,0x10425,1,40} }; convertStruct toUpper[] = *************** *** 1729,1763 **** {0x131,0x131,-1,-232}, {0x133,0x137,2,-1}, {0x13a,0x148,2,-1}, {0x14b,0x177,2,-1}, {0x17a,0x17e,2,-1}, {0x17f,0x17f,-1,-300}, {0x183,0x185,2,-1}, {0x188,0x18c,4,-1}, {0x192,0x192,-1,-1}, ! {0x195,0x195,-1,97}, {0x199,0x1a1,8,-1}, {0x1a3,0x1a5,2,-1}, ! {0x1a8,0x1ad,5,-1}, {0x1b0,0x1b4,4,-1}, {0x1b6,0x1b9,3,-1}, ! {0x1bd,0x1bd,-1,-1}, {0x1bf,0x1bf,-1,56}, {0x1c5,0x1c6,1,-1}, ! {0x1c8,0x1c9,1,-1}, {0x1cb,0x1cc,1,-1}, {0x1ce,0x1dc,2,-1}, ! {0x1dd,0x1dd,-1,-79}, {0x1df,0x1ef,2,-1}, {0x1f2,0x1f3,1,-1}, ! {0x1f5,0x1f9,4,-1}, {0x1fb,0x21f,2,-1}, {0x223,0x233,2,-1}, ! {0x253,0x253,-1,-210}, {0x254,0x254,-1,-206}, {0x256,0x257,1,-205}, ! {0x259,0x259,-1,-202}, {0x25b,0x25b,-1,-203}, {0x260,0x260,-1,-205}, ! {0x263,0x263,-1,-207}, {0x268,0x268,-1,-209}, {0x269,0x26f,6,-211}, ! {0x272,0x272,-1,-213}, {0x275,0x275,-1,-214}, {0x280,0x283,3,-218}, ! {0x288,0x288,-1,-218}, {0x28a,0x28b,1,-217}, {0x292,0x292,-1,-219}, ! {0x3ac,0x3ac,-1,-38}, {0x3ad,0x3af,1,-37}, {0x3b1,0x3c1,1,-32}, ! {0x3c2,0x3c2,-1,-31}, {0x3c3,0x3cb,1,-32}, {0x3cc,0x3cc,-1,-64}, ! {0x3cd,0x3ce,1,-63}, {0x3d0,0x3d0,-1,-62}, {0x3d1,0x3d1,-1,-57}, ! {0x3d5,0x3d5,-1,-47}, {0x3d6,0x3d6,-1,-54}, {0x3db,0x3ef,2,-1}, ! {0x3f0,0x3f0,-1,-86}, {0x3f1,0x3f1,-1,-80}, {0x3f2,0x3f2,-1,-79}, ! {0x3f5,0x3f5,-1,-96}, {0x430,0x44f,1,-32}, {0x450,0x45f,1,-80}, ! {0x461,0x481,2,-1}, {0x48d,0x4bf,2,-1}, {0x4c2,0x4c4,2,-1}, ! {0x4c8,0x4cc,4,-1}, {0x4d1,0x4f5,2,-1}, {0x4f9,0x4f9,-1,-1}, ! {0x561,0x586,1,-48}, {0x1e01,0x1e95,2,-1}, {0x1e9b,0x1e9b,-1,-59}, ! {0x1ea1,0x1ef9,2,-1}, {0x1f00,0x1f07,1,8}, {0x1f10,0x1f15,1,8}, ! {0x1f20,0x1f27,1,8}, {0x1f30,0x1f37,1,8}, {0x1f40,0x1f45,1,8}, ! {0x1f51,0x1f57,2,8}, {0x1f60,0x1f67,1,8}, {0x1f70,0x1f71,1,74}, ! {0x1f72,0x1f75,1,86}, {0x1f76,0x1f77,1,100}, {0x1f78,0x1f79,1,128}, ! {0x1f7a,0x1f7b,1,112}, {0x1f7c,0x1f7d,1,126}, {0x1f80,0x1f87,1,8}, ! {0x1f90,0x1f97,1,8}, {0x1fa0,0x1fa7,1,8}, {0x1fb0,0x1fb1,1,8}, ! {0x1fb3,0x1fb3,-1,9}, {0x1fbe,0x1fbe,-1,-7205}, {0x1fc3,0x1fc3,-1,9}, ! {0x1fd0,0x1fd1,1,8}, {0x1fe0,0x1fe1,1,8}, {0x1fe5,0x1fe5,-1,7}, ! {0x1ff3,0x1ff3,-1,9}, {0xff41,0xff5a,1,-32}, {0x10428,0x1044d,1,-40} }; /* --- 1763,1798 ---- {0x131,0x131,-1,-232}, {0x133,0x137,2,-1}, {0x13a,0x148,2,-1}, {0x14b,0x177,2,-1}, {0x17a,0x17e,2,-1}, {0x17f,0x17f,-1,-300}, {0x183,0x185,2,-1}, {0x188,0x18c,4,-1}, {0x192,0x192,-1,-1}, ! {0x195,0x195,-1,97}, {0x199,0x199,-1,-1}, {0x19e,0x19e,-1,130}, ! {0x1a1,0x1a5,2,-1}, {0x1a8,0x1ad,5,-1}, {0x1b0,0x1b4,4,-1}, ! {0x1b6,0x1b9,3,-1}, {0x1bd,0x1bd,-1,-1}, {0x1bf,0x1bf,-1,56}, ! {0x1c5,0x1c6,1,-1}, {0x1c8,0x1c9,1,-1}, {0x1cb,0x1cc,1,-1}, ! {0x1ce,0x1dc,2,-1}, {0x1dd,0x1dd,-1,-79}, {0x1df,0x1ef,2,-1}, ! {0x1f2,0x1f3,1,-1}, {0x1f5,0x1f9,4,-1}, {0x1fb,0x21f,2,-1}, ! {0x223,0x233,2,-1}, {0x253,0x253,-1,-210}, {0x254,0x254,-1,-206}, ! {0x256,0x257,1,-205}, {0x259,0x259,-1,-202}, {0x25b,0x25b,-1,-203}, ! {0x260,0x260,-1,-205}, {0x263,0x263,-1,-207}, {0x268,0x268,-1,-209}, ! {0x269,0x26f,6,-211}, {0x272,0x272,-1,-213}, {0x275,0x275,-1,-214}, ! {0x280,0x283,3,-218}, {0x288,0x288,-1,-218}, {0x28a,0x28b,1,-217}, ! {0x292,0x292,-1,-219}, {0x3ac,0x3ac,-1,-38}, {0x3ad,0x3af,1,-37}, ! {0x3b1,0x3c1,1,-32}, {0x3c2,0x3c2,-1,-31}, {0x3c3,0x3cb,1,-32}, ! {0x3cc,0x3cc,-1,-64}, {0x3cd,0x3ce,1,-63}, {0x3d0,0x3d0,-1,-62}, ! {0x3d1,0x3d1,-1,-57}, {0x3d5,0x3d5,-1,-47}, {0x3d6,0x3d6,-1,-54}, ! {0x3d9,0x3ef,2,-1}, {0x3f0,0x3f0,-1,-86}, {0x3f1,0x3f1,-1,-80}, ! {0x3f2,0x3f2,-1,-79}, {0x3f5,0x3f5,-1,-96}, {0x430,0x44f,1,-32}, ! {0x450,0x45f,1,-80}, {0x461,0x481,2,-1}, {0x48b,0x4bf,2,-1}, ! {0x4c2,0x4ce,2,-1}, {0x4d1,0x4f5,2,-1}, {0x4f9,0x501,8,-1}, ! {0x503,0x50f,2,-1}, {0x561,0x586,1,-48}, {0x1e01,0x1e95,2,-1}, ! {0x1e9b,0x1e9b,-1,-59}, {0x1ea1,0x1ef9,2,-1}, {0x1f00,0x1f07,1,8}, ! {0x1f10,0x1f15,1,8}, {0x1f20,0x1f27,1,8}, {0x1f30,0x1f37,1,8}, ! {0x1f40,0x1f45,1,8}, {0x1f51,0x1f57,2,8}, {0x1f60,0x1f67,1,8}, ! {0x1f70,0x1f71,1,74}, {0x1f72,0x1f75,1,86}, {0x1f76,0x1f77,1,100}, ! {0x1f78,0x1f79,1,128}, {0x1f7a,0x1f7b,1,112}, {0x1f7c,0x1f7d,1,126}, ! {0x1f80,0x1f87,1,8}, {0x1f90,0x1f97,1,8}, {0x1fa0,0x1fa7,1,8}, ! {0x1fb0,0x1fb1,1,8}, {0x1fb3,0x1fb3,-1,9}, {0x1fbe,0x1fbe,-1,-7205}, ! {0x1fc3,0x1fc3,-1,9}, {0x1fd0,0x1fd1,1,8}, {0x1fe0,0x1fe1,1,8}, ! {0x1fe5,0x1fe5,-1,7}, {0x1ff3,0x1ff3,-1,9}, {0xff41,0xff5a,1,-32}, ! {0x10428,0x1044d,1,-40} }; /* *** ../vim61.441/src/version.c Sun Apr 6 14:47:26 2003 --- src/version.c Sun Apr 6 14:49:04 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 442, /**/ -- Time flies like an arrow. Fruit flies like a banana. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///