Ignore:
Timestamp:
Oct 2, 2017, 12:54:34 PM (21 months ago)
Author:
cameron
Message:

UCD corrections and additional properties

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/UCD/ScriptExtensions.h

    r5656 r5660  
    99 */
    1010
     11#include "PropertyAliases.h"
    1112#include "PropertyObjects.h"
    1213#include "PropertyValueAliases.h"
     
    330331        [00bb, 00bf], [00d7, 00d7], [00f7, 00f7], [02b9, 02df],
    331332        [02e5, 02e9], [02ec, 02ff], [0374, 0374], [037e, 037e],
    332         [0385, 0385], [0387, 0387], [0589, 0589], [0605, 0605],
    333         [060c, 060c], [061b, 061c], [061f, 061f], [0640, 0640],
    334         [06dd, 06dd], [08e2, 08e2], [0964, 0965], [0e3f, 0e3f],
    335         [0fd5, 0fd8], [10fb, 10fb], [16eb, 16ed], [1735, 1736],
    336         [1802, 1803], [1805, 1805], [1cd3, 1cd3], [1ce1, 1ce1],
    337         [1ce9, 1cec], [1cee, 1cf3], [1cf5, 1cf6], [2000, 200b],
    338         [200e, 2064], [2066, 2070], [2074, 207e], [2080, 208e],
    339         [20a0, 20be], [2100, 2125], [2127, 2129], [212c, 2131],
    340         [2133, 214d], [214f, 215f], [2189, 218b], [2190, 23fe],
    341         [2400, 2426], [2440, 244a], [2460, 27ff], [2900, 2b73],
    342         [2b76, 2b95], [2b98, 2bb9], [2bbd, 2bc8], [2bca, 2bd1],
    343         [2bec, 2bef], [2e00, 2e44], [2ff0, 2ffb], [3000, 3004],
    344         [3006, 3006], [3008, 3020], [3030, 3037], [303c, 303f],
    345         [309b, 309c], [30a0, 30a0], [30fb, 30fc], [3190, 319f],
    346         [31c0, 31e3], [3220, 325f], [327f, 32cf], [3358, 33ff],
    347         [4dc0, 4dff], [a700, a721], [a788, a78a], [a830, a839],
    348         [a92e, a92e], [a9cf, a9cf], [ab5b, ab5b], [fd3e, fd3f],
    349         [fe10, fe19], [fe30, fe52], [fe54, fe66], [fe68, fe6b],
    350         [feff, feff], [ff01, ff20], [ff3b, ff40], [ff5b, ff65],
    351         [ff70, ff70], [ff9e, ff9f], [ffe0, ffe6], [ffe8, ffee],
    352         [fff9, fffd], [10100, 10102], [10107, 10133], [10137, 1013f],
    353         [10190, 1019b], [101d0, 101fc], [102e1, 102fb], [1bca0, 1bca3],
    354         [1d000, 1d0f5], [1d100, 1d126], [1d129, 1d166], [1d16a, 1d17a],
    355         [1d183, 1d184], [1d18c, 1d1a9], [1d1ae, 1d1e8], [1d300, 1d356],
    356         [1d360, 1d371], [1d400, 1d454], [1d456, 1d49c], [1d49e, 1d49f],
     333        [0385, 0385], [0387, 0387], [0605, 0605], [061c, 061c],
     334        [06dd, 06dd], [08e2, 08e2], [0e3f, 0e3f], [0fd5, 0fd8],
     335        [16eb, 16ed], [2000, 200b], [200e, 2064], [2066, 2070],
     336        [2074, 207e], [2080, 208e], [20a0, 20be], [2100, 2125],
     337        [2127, 2129], [212c, 2131], [2133, 214d], [214f, 215f],
     338        [2189, 218b], [2190, 23fe], [2400, 2426], [2440, 244a],
     339        [2460, 27ff], [2900, 2b73], [2b76, 2b95], [2b98, 2bb9],
     340        [2bbd, 2bc8], [2bca, 2bd1], [2bec, 2bef], [2e00, 2e42],
     341        [2e44, 2e44], [2ff0, 2ffb], [3000, 3000], [3004, 3004],
     342        [3012, 3012], [3020, 3020], [3036, 3036], [3248, 325f],
     343        [327f, 327f], [32b1, 32bf], [32cc, 32cf], [3371, 337a],
     344        [3380, 33df], [33ff, 33ff], [4dc0, 4dff], [a700, a721],
     345        [a788, a78a], [ab5b, ab5b], [fd3e, fd3f], [fe10, fe19],
     346        [fe30, fe44], [fe47, fe52], [fe54, fe66], [fe68, fe6b],
     347        [feff, feff], [ff01, ff20], [ff3b, ff40], [ff5b, ff60],
     348        [ffe0, ffe6], [ffe8, ffee], [fff9, fffd], [10190, 1019b],
     349        [101d0, 101fc], [1d000, 1d0f5], [1d100, 1d126], [1d129, 1d166],
     350        [1d16a, 1d17a], [1d183, 1d184], [1d18c, 1d1a9], [1d1ae, 1d1e8],
     351        [1d300, 1d356], [1d400, 1d454], [1d456, 1d49c], [1d49e, 1d49f],
    357352        [1d4a2, 1d4a2], [1d4a5, 1d4a6], [1d4a9, 1d4ac], [1d4ae, 1d4b9],
    358353        [1d4bb, 1d4bb], [1d4bd, 1d4c3], [1d4c5, 1d505], [1d507, 1d50a],
     
    363358        [1f100, 1f10c], [1f110, 1f12e], [1f130, 1f16b], [1f170, 1f1ac],
    364359        [1f1e6, 1f1ff], [1f201, 1f202], [1f210, 1f23b], [1f240, 1f248],
    365         [1f250, 1f251], [1f300, 1f6d2], [1f6e0, 1f6ec], [1f6f0, 1f6f6],
    366         [1f700, 1f773], [1f780, 1f7d4], [1f800, 1f80b], [1f810, 1f847],
    367         [1f850, 1f859], [1f860, 1f887], [1f890, 1f8ad], [1f910, 1f91e],
    368         [1f920, 1f927], [1f930, 1f930], [1f933, 1f93e], [1f940, 1f94b],
    369         [1f950, 1f95e], [1f980, 1f991], [1f9c0, 1f9c0], [e0001, e0001],
    370         [e0020, e007f]**/
     360        [1f300, 1f6d2], [1f6e0, 1f6ec], [1f6f0, 1f6f6], [1f700, 1f773],
     361        [1f780, 1f7d4], [1f800, 1f80b], [1f810, 1f847], [1f850, 1f859],
     362        [1f860, 1f887], [1f890, 1f8ad], [1f910, 1f91e], [1f920, 1f927],
     363        [1f930, 1f930], [1f933, 1f93e], [1f940, 1f94b], [1f950, 1f95e],
     364        [1f980, 1f991], [1f9c0, 1f9c0], [e0001, e0001], [e0020, e007f]**/
    371365        const UnicodeSet zyyy_Ext
    372366            {{{Full, 2}, {Mixed, 2}, {Full, 1}, {Mixed, 3}, {Empty, 13},
    373367              {Mixed, 1}, {Full, 1}, {Mixed, 1}, {Empty, 3}, {Mixed, 2},
    374               {Empty, 15}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 1},
    375               {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Empty, 16}, {Mixed, 1},
    376               {Empty, 3}, {Mixed, 1}, {Empty, 37}, {Mixed, 1}, {Empty, 12},
    377               {Mixed, 1}, {Empty, 8}, {Mixed, 1}, {Empty, 47}, {Mixed, 1},
    378               {Empty, 1}, {Mixed, 1}, {Empty, 6}, {Mixed, 1}, {Empty, 37},
    379               {Mixed, 2}, {Empty, 24}, {Mixed, 1}, {Full, 2}, {Mixed, 3},
    380               {Empty, 2}, {Full, 1}, {Mixed, 2}, {Empty, 1}, {Mixed, 1},
    381               {Full, 18}, {Mixed, 1}, {Full, 1}, {Mixed, 2}, {Full, 29},
    382               {Empty, 8}, {Full, 19}, {Mixed, 5}, {Empty, 16}, {Full, 2},
    383               {Mixed, 1}, {Empty, 12}, {Mixed, 3}, {Empty, 2}, {Mixed, 2},
    384               {Empty, 1}, {Mixed, 1}, {Empty, 4}, {Mixed, 1}, {Empty, 1},
    385               {Full, 1}, {Mixed, 1}, {Empty, 1}, {Full, 2}, {Mixed, 1},
    386               {Full, 2}, {Mixed, 1}, {Empty, 3}, {Mixed, 1}, {Full, 5},
    387               {Empty, 206}, {Full, 2}, {Empty, 712}, {Full, 1}, {Mixed, 1},
    388               {Empty, 2}, {Mixed, 1}, {Empty, 4}, {Mixed, 1}, {Empty, 7},
    389               {Mixed, 1}, {Empty, 4}, {Mixed, 1}, {Empty, 11}, {Mixed, 1},
    390               {Empty, 654}, {Mixed, 1}, {Empty, 6}, {Mixed, 4}, {Empty, 3},
    391               {Mixed, 6}, {Empty, 2}, {Mixed, 1}, {Empty, 8}, {Mixed, 2},
    392               {Empty, 2}, {Mixed, 1}, {Empty, 1}, {Mixed, 2}, {Empty, 7},
    393               {Mixed, 1}, {Empty, 1485}, {Mixed, 1}, {Empty, 154},
    394               {Full, 7}, {Mixed, 1}, {Full, 1}, {Mixed, 1}, {Full, 1},
    395               {Mixed, 3}, {Full, 1}, {Mixed, 1}, {Empty, 8}, {Full, 2},
    396               {Mixed, 2}, {Empty, 4}, {Full, 2}, {Mixed, 1}, {Full, 1},
    397               {Mixed, 3}, {Full, 1}, {Mixed, 3}, {Full, 10}, {Mixed, 1},
    398               {Full, 8}, {Mixed, 1}, {Full, 1}, {Empty, 192}, {Full, 1},
    399               {Mixed, 1}, {Full, 2}, {Mixed, 6}, {Full, 1}, {Mixed, 1},
    400               {Full, 1}, {Mixed, 1}, {Empty, 1}, {Mixed, 4}, {Empty, 5},
    401               {Full, 30}, {Mixed, 2}, {Full, 3}, {Mixed, 1}, {Full, 2},
    402               {Mixed, 1}, {Empty, 1}, {Mixed, 1}, {Full, 1}, {Mixed, 1},
    403               {Full, 1}, {Mixed, 2}, {Empty, 2}, {Mixed, 3}, {Empty, 1},
    404               {Mixed, 1}, {Empty, 1}, {Mixed, 1}, {Empty, 24625},
    405               {Mixed, 1}, {Full, 3}, {Empty, 6140}},
     368              {Empty, 19}, {Mixed, 1}, {Empty, 5}, {Mixed, 1}, {Empty, 16},
     369              {Mixed, 1}, {Empty, 41}, {Mixed, 1}, {Empty, 12}, {Mixed, 1},
     370              {Empty, 56}, {Mixed, 1}, {Empty, 72}, {Mixed, 1}, {Full, 2},
     371              {Mixed, 3}, {Empty, 2}, {Full, 1}, {Mixed, 2}, {Empty, 1},
     372              {Mixed, 1}, {Full, 18}, {Mixed, 1}, {Full, 1}, {Mixed, 2},
     373              {Full, 29}, {Empty, 8}, {Full, 19}, {Mixed, 5}, {Empty, 16},
     374              {Full, 2}, {Mixed, 1}, {Empty, 12}, {Mixed, 3}, {Empty, 16},
     375              {Mixed, 2}, {Empty, 1}, {Mixed, 2}, {Empty, 4}, {Mixed, 1},
     376              {Full, 3}, {Mixed, 1}, {Empty, 206}, {Full, 2}, {Empty, 712},
     377              {Full, 1}, {Mixed, 1}, {Empty, 2}, {Mixed, 1}, {Empty, 29},
     378              {Mixed, 1}, {Empty, 654}, {Mixed, 1}, {Empty, 6}, {Mixed, 4},
     379              {Empty, 3}, {Mixed, 5}, {Empty, 3}, {Mixed, 1}, {Empty, 12},
     380              {Mixed, 1}, {Empty, 1}, {Mixed, 2}, {Empty, 1648}, {Full, 7},
     381              {Mixed, 1}, {Full, 1}, {Mixed, 1}, {Full, 1}, {Mixed, 3},
     382              {Full, 1}, {Mixed, 1}, {Empty, 8}, {Full, 2}, {Mixed, 1},
     383              {Empty, 5}, {Full, 2}, {Mixed, 1}, {Full, 1}, {Mixed, 3},
     384              {Full, 1}, {Mixed, 3}, {Full, 10}, {Mixed, 1}, {Full, 8},
     385              {Mixed, 1}, {Full, 1}, {Empty, 192}, {Full, 1}, {Mixed, 1},
     386              {Full, 2}, {Mixed, 6}, {Full, 1}, {Mixed, 1}, {Full, 1},
     387              {Mixed, 1}, {Empty, 1}, {Mixed, 4}, {Empty, 5}, {Full, 30},
     388              {Mixed, 2}, {Full, 3}, {Mixed, 1}, {Full, 2}, {Mixed, 1},
     389              {Empty, 1}, {Mixed, 1}, {Full, 1}, {Mixed, 1}, {Full, 1},
     390              {Mixed, 2}, {Empty, 2}, {Mixed, 3}, {Empty, 1}, {Mixed, 1},
     391              {Empty, 1}, {Mixed, 1}, {Empty, 24625}, {Mixed, 1}, {Full, 3},
     392              {Empty, 6140}},
    406393             {0xf8000001, 0xf8000001, 0xfbfffbff, 0x00800000, 0x00800000,
    407               0xfe000000, 0xfffff3e0, 0x40100000, 0x000000a0, 0x00000200,
    408               0x98001020, 0x00000001, 0x20000000, 0x00000004, 0x00000030,
    409               0x80000000, 0x01e00000, 0x08000000, 0x00003800, 0x00600000,
    410               0x0000002c, 0x00080000, 0x006fde02, 0xffffcfff, 0x7ff1ffdf,
    411               0x00007fff, 0x7fffffff, 0xfffbf3bf, 0xffffbfff, 0xffff0e00,
    412               0x7fffffff, 0x0000007f, 0x000007ff, 0xffcfffff, 0xff3fffff,
    413               0xe3ffffff, 0x0003fdff, 0x0000f000, 0x0000001f, 0x0fff0000,
    414               0xffffff5f, 0xf0ff0001, 0x18000000, 0x00000001, 0x18000000,
    415               0xffff0000, 0x0000000f, 0x80000000, 0x0000ffff, 0xff000000,
    416               0x00000003, 0x00000700, 0x03ff0000, 0x00004000, 0x00008000,
    417               0x08000000, 0xc0000000, 0x03ff0000, 0xffff0000, 0xfff7ffff,
    418               0x00000f7f, 0x80000000, 0xfffffffe, 0xf8000001, 0xf8000001,
    419               0x0001003f, 0xc0000000, 0x3e007f7f, 0xffffff87, 0xff8fffff,
    420               0x0fff0000, 0xffff0000, 0x1fffffff, 0x0ffffffe, 0x0000000f,
    421               0x003fffff, 0xfffffe7f, 0x07fffc7f, 0xfffff018, 0xffffc3ff,
    422               0x000001ff, 0x007fffff, 0x0003ffff, 0xffdfffff, 0xdfffffff,
    423               0xebffde64, 0xffffffef, 0xdfdfe7bf, 0x7bffffff, 0xfffdfc5f,
    424               0xffffff3f, 0xffffcfff, 0xffff0fff, 0x000fffff, 0xfffe7fff,
    425               0xfffefffe, 0x003fffff, 0xffff1fff, 0xffff7fff, 0xffff0fff,
    426               0x00001fff, 0xffffffc0, 0xffff0006, 0x0fffffff, 0x000301ff,
    427               0x0007ffff, 0x007f1fff, 0x000fffff, 0x001fffff, 0xffff0fff,
    428               0x03ff00ff, 0xffff00ff, 0x00003fff, 0x7fff0000, 0x7ff900ff,
    429               0x7fff0fff, 0x0003ffff, 0x00000001, 0x00000002}};
     394              0xfe000000, 0xfffff3e0, 0x40100000, 0x000000a0, 0x10000020,
     395              0x20000000, 0x00000004, 0x80000000, 0x01e00000, 0x00003800,
     396              0xffffcfff, 0x7ff1ffdf, 0x00007fff, 0x7fffffff, 0xfffbf3bf,
     397              0xffffbfff, 0xffff0e00, 0x7fffffff, 0x0000007f, 0x000007ff,
     398              0xffcfffff, 0xff3fffff, 0xe3ffffff, 0x0003fdff, 0x0000f000,
     399              0x00000017, 0x0fff0000, 0x00040011, 0x00400001, 0xffffff00,
     400              0x80000000, 0xfffe0000, 0x0000f000, 0x07fe0000, 0x80000000,
     401              0x00000003, 0x00000700, 0x08000000, 0xc0000000, 0x03ff0000,
     402              0xffff0000, 0xfff7ff9f, 0x00000f7f, 0x80000000, 0xfffffffe,
     403              0xf8000001, 0xf8000001, 0x00000001, 0x3e007f7f, 0x0fff0000,
     404              0xffff0000, 0x1fffffff, 0x003fffff, 0xfffffe7f, 0x07fffc7f,
     405              0xfffff018, 0xffffc3ff, 0x000001ff, 0x007fffff, 0xffdfffff,
     406              0xdfffffff, 0xebffde64, 0xffffffef, 0xdfdfe7bf, 0x7bffffff,
     407              0xfffdfc5f, 0xffffff3f, 0xffffcfff, 0xffff0fff, 0x000fffff,
     408              0xfffe7fff, 0xfffefffe, 0x003fffff, 0xffff1fff, 0xffff7fff,
     409              0xffff0fff, 0x00001fff, 0xffffffc0, 0xffff0006, 0x0fffffff,
     410              0x000001ff, 0x0007ffff, 0x007f1fff, 0x000fffff, 0x001fffff,
     411              0xffff0fff, 0x03ff00ff, 0xffff00ff, 0x00003fff, 0x7fff0000,
     412              0x7ff900ff, 0x7fff0fff, 0x0003ffff, 0x00000001, 0x00000002}};
    430413        /** Code Point Ranges for Latn
    431414        [0041, 005a], [0061, 007a], [00aa, 00aa], [00ba, 00ba],
     
    844827             {0x0000ffff}};
    845828        /** Code Point Ranges for Zinh
    846         [0300, 036f], [0485, 0486], [064b, 0655], [0670, 0670],
    847         [0951, 0952], [1ab0, 1abe], [1cd0, 1cd2], [1cd4, 1ce0],
    848         [1ce2, 1ce8], [1ced, 1ced], [1cf4, 1cf4], [1cf8, 1cf9],
    849         [1dc0, 1df5], [1dfb, 1dff], [200c, 200d], [20d0, 20f0],
    850         [302a, 302d], [3099, 309a], [fe00, fe0f], [fe20, fe2d],
    851         [101fd, 101fd], [102e0, 102e0], [1d167, 1d169], [1d17b, 1d182],
    852         [1d185, 1d18b], [1d1aa, 1d1ad], [e0100, e01ef]**/
     829        [0300, 0341], [0343, 0344], [0346, 0362], [1ab0, 1abe],
     830        [1dc2, 1df5], [1dfb, 1dff], [200c, 200d], [20d0, 20ef],
     831        [fe00, fe0f], [fe20, fe2d], [101fd, 101fd], [1d167, 1d169],
     832        [1d17b, 1d182], [1d185, 1d18b], [1d1aa, 1d1ad], [e0100, e01ef]**/
    853833        const UnicodeSet zinh_Ext
    854             {{{Empty, 24}, {Full, 3}, {Mixed, 1}, {Empty, 8}, {Mixed, 1},
    855               {Empty, 13}, {Mixed, 2}, {Empty, 22}, {Mixed, 1},
    856               {Empty, 138}, {Mixed, 1}, {Empty, 16}, {Mixed, 2}, {Empty, 6},
    857               {Full, 1}, {Mixed, 1}, {Empty, 16}, {Mixed, 1}, {Empty, 5},
    858               {Mixed, 2}, {Empty, 121}, {Mixed, 1}, {Empty, 2}, {Mixed, 1},
    859               {Empty, 1643}, {Mixed, 2}, {Empty, 29}, {Mixed, 1},
    860               {Empty, 7}, {Mixed, 1}, {Empty, 1651}, {Mixed, 3},
    861               {Empty, 24954}, {Full, 7}, {Mixed, 1}, {Empty, 6128}},
    862              {0x0000ffff, 0x00000060, 0x003ff800, 0x00010000, 0x00060000,
    863               0x7fff0000, 0xfff70000, 0x031021fd, 0xf83fffff, 0x00003000,
    864               0xffff0000, 0x0001ffff, 0x00003c00, 0x06000000, 0x0000ffff,
    865               0x00003fff, 0x20000000, 0x00000001, 0xf8000380, 0x00000fe7,
    866               0x00003c00, 0x0000ffff}};
     834            {{{Empty, 24}, {Full, 2}, {Mixed, 2}, {Empty, 185}, {Mixed, 1},
     835              {Empty, 24}, {Mixed, 2}, {Empty, 16}, {Mixed, 1}, {Empty, 5},
     836              {Mixed, 2}, {Empty, 1768}, {Mixed, 2}, {Empty, 29},
     837              {Mixed, 1}, {Empty, 1659}, {Mixed, 3}, {Empty, 24954},
     838              {Full, 7}, {Mixed, 1}, {Empty, 6128}},
     839             {0xffffffdb, 0x00000007, 0x7fff0000, 0xfffffffc, 0xf83fffff,
     840              0x00003000, 0xffff0000, 0x0000ffff, 0x0000ffff, 0x00003fff,
     841              0x20000000, 0xf8000380, 0x00000fe7, 0x00003c00, 0x0000ffff}};
    867842        /** Code Point Ranges for Tglg
    868843        [1700, 170c], [170e, 1714], [1735, 1736]**/
Note: See TracChangeset for help on using the changeset viewer.