@wcardinal/wcardinal-ui 0.457.0 → 0.457.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/types/wcardinal/ui/util/character.d.ts +35 -1
- package/dist/types/wcardinal/ui/util/util-character-iterator.d.ts +0 -3
- package/dist/wcardinal/ui/shape/e-shape-points-marker-base.js +5 -1
- package/dist/wcardinal/ui/shape/e-shape-points-marker-base.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-text-impl.js +7 -3
- package/dist/wcardinal/ui/shape/variant/e-shape-text-impl.js.map +1 -1
- package/dist/wcardinal/ui/util/character.js +35 -1
- package/dist/wcardinal/ui/util/character.js.map +1 -1
- package/dist/wcardinal/ui/util/dynamic-font-atlas.js +18 -8
- package/dist/wcardinal/ui/util/dynamic-font-atlas.js.map +1 -1
- package/dist/wcardinal/ui/util/dynamic-sdf-font-atlas.js +6 -2
- package/dist/wcardinal/ui/util/dynamic-sdf-font-atlas.js.map +1 -1
- package/dist/wcardinal/ui/util/util-character-iterator.js +3 -10
- package/dist/wcardinal/ui/util/util-character-iterator.js.map +1 -1
- package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
- package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
- package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
- package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
- package/dist/wcardinal-ui-theme-dark.js +1 -1
- package/dist/wcardinal-ui-theme-dark.min.js +1 -1
- package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
- package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
- package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
- package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
- package/dist/wcardinal-ui-theme-white.js +1 -1
- package/dist/wcardinal-ui-theme-white.min.js +1 -1
- package/dist/wcardinal-ui.cjs.js +73 -26
- package/dist/wcardinal-ui.js +73 -26
- package/dist/wcardinal-ui.min.js +2 -2
- package/dist/wcardinal-ui.min.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Copyright (C) 2019 Toshiba Corporation
|
|
3
3
|
* SPDX-License-Identifier: Apache-2.0
|
|
4
4
|
*/
|
|
5
|
+
import { Character } from "./character";
|
|
5
6
|
var UtilCharacterIterator = /** @class */ (function () {
|
|
6
7
|
function UtilCharacterIterator() {
|
|
7
8
|
this.target = "";
|
|
@@ -18,21 +19,13 @@ var UtilCharacterIterator = /** @class */ (function () {
|
|
|
18
19
|
var iend = target.length;
|
|
19
20
|
for (var i = istart; i < iend; ++i) {
|
|
20
21
|
var code = target.charCodeAt(i);
|
|
21
|
-
if (!
|
|
22
|
+
if (!(Character.SURROGATE.LOW.FROM <= code && code <= Character.SURROGATE.LOW.TO) &&
|
|
23
|
+
!(Character.VARIATION.FROM <= code && code <= Character.VARIATION.TO)) {
|
|
22
24
|
return i;
|
|
23
25
|
}
|
|
24
26
|
}
|
|
25
27
|
return iend;
|
|
26
28
|
};
|
|
27
|
-
UtilCharacterIterator.prototype.isHighSurrogate = function (code) {
|
|
28
|
-
return 0xd800 <= code && code <= 0xdbff;
|
|
29
|
-
};
|
|
30
|
-
UtilCharacterIterator.prototype.isLowSurrogate = function (code) {
|
|
31
|
-
return 0xdc00 <= code && code <= 0xdfff;
|
|
32
|
-
};
|
|
33
|
-
UtilCharacterIterator.prototype.isVariationSelector = function (code) {
|
|
34
|
-
return 0xfe00 <= code && code <= 0xfe0f;
|
|
35
|
-
};
|
|
36
29
|
UtilCharacterIterator.prototype.next = function () {
|
|
37
30
|
var target = this.target;
|
|
38
31
|
var position = this.position;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util-character-iterator.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/util/util-character-iterator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;IAKC;QACC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,oCAAI,GAAJ,UAAK,MAAc;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,uCAAO,GAAP;QACC,OAAO,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC3C,CAAC;IAES,6CAAa,GAAvB,UAAwB,MAAc,EAAE,MAAc;QACrD,IAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YACpC,IAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAClC,
|
|
1
|
+
{"version":3,"file":"util-character-iterator.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/util/util-character-iterator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;IAKC;QACC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,oCAAI,GAAJ,UAAK,MAAc;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,uCAAO,GAAP;QACC,OAAO,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC3C,CAAC;IAES,6CAAa,GAAvB,UAAwB,MAAc,EAAE,MAAc;QACrD,IAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,KAAK,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;YACpC,IAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAClC,IACC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7E,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,EACpE,CAAC;gBACF,OAAO,CAAC,CAAC;YACV,CAAC;QACF,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,oCAAI,GAAJ;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;QAC3D,IAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,OAAO,MAAM,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,qCAAK,GAAL;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAClC,IAAI,IAAI,CAAC,QAAQ,GAAG,MAAM,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;YACvB,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,0BAAI,GAAX,UAAY,MAAc;QACzB,IAAI,qBAAqB,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YAC7C,qBAAqB,CAAC,SAAS,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAC/D,CAAC;QACD,IAAM,QAAQ,GAAG,qBAAqB,CAAC,SAAS,CAAC;QACjD,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,OAAO,QAAQ,CAAC;IACjB,CAAC;IA9DgB,+BAAS,GAAiC,IAAI,CAAC;IA+DjE,4BAAC;CAAA,AAhED,IAgEC;SAhEY,qBAAqB","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Character } from \"./character\";\n\nexport class UtilCharacterIterator {\n\tprotected static _instance: UtilCharacterIterator | null = null;\n\ttarget: string;\n\tposition: number;\n\n\tconstructor() {\n\t\tthis.target = \"\";\n\t\tthis.position = 0;\n\t}\n\n\tinit(target: string): void {\n\t\tthis.target = target;\n\t\tthis.position = 0;\n\t}\n\n\thasNext(): boolean {\n\t\treturn this.position < this.target.length;\n\t}\n\n\tprotected findNextBreak(target: string, istart: number): number {\n\t\tconst iend = target.length;\n\t\tfor (let i = istart; i < iend; ++i) {\n\t\t\tconst code = target.charCodeAt(i);\n\t\t\tif (\n\t\t\t\t!(Character.SURROGATE.LOW.FROM <= code && code <= Character.SURROGATE.LOW.TO) &&\n\t\t\t\t!(Character.VARIATION.FROM <= code && code <= Character.VARIATION.TO)\n\t\t\t) {\n\t\t\t\treturn i;\n\t\t\t}\n\t\t}\n\t\treturn iend;\n\t}\n\n\tnext(): string {\n\t\tconst target = this.target;\n\t\tconst position = this.position;\n\t\tconst nextBreak = this.findNextBreak(target, position + 1);\n\t\tconst result = target.substring(position, nextBreak);\n\t\tthis.position = nextBreak;\n\t\treturn result;\n\t}\n\n\t/**\n\t * Closes this iterator.\n\t *\n\t * @returns true if closed.\n\t */\n\tclose(): boolean {\n\t\tconst length = this.target.length;\n\t\tif (this.position < length) {\n\t\t\tthis.position = length;\n\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tstatic from(target: string): UtilCharacterIterator {\n\t\tif (UtilCharacterIterator._instance == null) {\n\t\t\tUtilCharacterIterator._instance = new UtilCharacterIterator();\n\t\t}\n\t\tconst instance = UtilCharacterIterator._instance;\n\t\tinstance.init(target);\n\t\treturn instance;\n\t}\n}\n"]}
|
package/dist/wcardinal-ui.cjs.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
Winter Cardinal UI v0.457.
|
|
2
|
+
Winter Cardinal UI v0.457.2
|
|
3
3
|
Copyright (C) 2019 Toshiba Corporation
|
|
4
4
|
SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
|
|
@@ -421,7 +421,41 @@ var toLength = function (p0x, p0y, p1x, p1y) {
|
|
|
421
421
|
* SPDX-License-Identifier: Apache-2.0
|
|
422
422
|
*/
|
|
423
423
|
var Character = {
|
|
424
|
-
|
|
424
|
+
/**
|
|
425
|
+
* ASCII Character Ranges
|
|
426
|
+
* LOW: Printable ASCII (0x21-0x7E) - '!' to '~'
|
|
427
|
+
* HIGH: Extended ASCII (0xA1-0xFF) - '¡' to 'ÿ'
|
|
428
|
+
*/
|
|
429
|
+
ASCII: {
|
|
430
|
+
LOW: {
|
|
431
|
+
FROM: 0x21,
|
|
432
|
+
TO: 0x7e
|
|
433
|
+
},
|
|
434
|
+
HIGH: {
|
|
435
|
+
FROM: 0xa1,
|
|
436
|
+
TO: 0xff
|
|
437
|
+
}
|
|
438
|
+
},
|
|
439
|
+
/**
|
|
440
|
+
* Surrogate Pair Ranges
|
|
441
|
+
*/
|
|
442
|
+
SURROGATE: {
|
|
443
|
+
LOW: {
|
|
444
|
+
FROM: 0xdc00,
|
|
445
|
+
TO: 0xdfff
|
|
446
|
+
},
|
|
447
|
+
HIGH: {
|
|
448
|
+
FROM: 0xd800,
|
|
449
|
+
TO: 0xdbff
|
|
450
|
+
}
|
|
451
|
+
},
|
|
452
|
+
/**
|
|
453
|
+
* Variation Selector Range
|
|
454
|
+
*/
|
|
455
|
+
VARIATION: {
|
|
456
|
+
FROM: 0xfe00,
|
|
457
|
+
TO: 0xfe0f
|
|
458
|
+
},
|
|
425
459
|
SPACE: " ",
|
|
426
460
|
TAB: "\t",
|
|
427
461
|
SOFT_TAB: " ",
|
|
@@ -7818,7 +7852,9 @@ var EShapeTextImpl = /** @class */ (function () {
|
|
|
7818
7852
|
var nacharactersLength = nacharacters.length;
|
|
7819
7853
|
var inacharacters = 0;
|
|
7820
7854
|
for (var i = 0, imax = value.length; i < imax;) {
|
|
7821
|
-
|
|
7855
|
+
var icc = value.charCodeAt(i);
|
|
7856
|
+
if ((Character.ASCII.LOW.FROM <= icc && icc <= Character.ASCII.LOW.TO) ||
|
|
7857
|
+
(Character.ASCII.HIGH.FROM <= icc && icc <= Character.ASCII.HIGH.TO)) {
|
|
7822
7858
|
// Add an ASCII character
|
|
7823
7859
|
var ac = value.substring(i, i + 1);
|
|
7824
7860
|
if (icharacters < charactersLength) {
|
|
@@ -7833,8 +7869,9 @@ var EShapeTextImpl = /** @class */ (function () {
|
|
|
7833
7869
|
}
|
|
7834
7870
|
var j = i + 1;
|
|
7835
7871
|
for (; j < imax; ++j) {
|
|
7836
|
-
var
|
|
7837
|
-
if ((
|
|
7872
|
+
var jcc = value.charCodeAt(j);
|
|
7873
|
+
if ((Character.SURROGATE.LOW.FROM <= jcc && jcc <= Character.SURROGATE.LOW.TO) ||
|
|
7874
|
+
(Character.VARIATION.FROM <= jcc && jcc <= Character.VARIATION.TO)) {
|
|
7838
7875
|
// Low surrogate
|
|
7839
7876
|
// Variation selector
|
|
7840
7877
|
continue;
|
|
@@ -13413,8 +13450,12 @@ var EShapePointsMarkerBase = /** @class */ (function () {
|
|
|
13413
13450
|
this.onFillChange();
|
|
13414
13451
|
};
|
|
13415
13452
|
EShapePointsMarkerBase.prototype.copy = function (source) {
|
|
13453
|
+
this.lock();
|
|
13454
|
+
this.type = source.type;
|
|
13416
13455
|
var size = source.size;
|
|
13417
|
-
this.set(
|
|
13456
|
+
this.size.set(size.x, size.y);
|
|
13457
|
+
this.fill.copy(source.fill);
|
|
13458
|
+
this.unlock();
|
|
13418
13459
|
return this;
|
|
13419
13460
|
};
|
|
13420
13461
|
EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
|
|
@@ -15788,8 +15829,12 @@ var DynamicSDFFontAtlas = /** @class */ (function () {
|
|
|
15788
15829
|
characters.set(Character.SPACE, this.newChar(Character.SPACE, DynamicFontAtlasCharacterType.SPACE_R));
|
|
15789
15830
|
characters.set(Character.TAB, this.newChar(Character.SOFT_TAB, DynamicFontAtlasCharacterType.SPACE_R));
|
|
15790
15831
|
characters.set(Character.DOTS, this.newChar(Character.DOTS, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
15791
|
-
for (var i =
|
|
15792
|
-
var ac =
|
|
15832
|
+
for (var i = Character.ASCII.LOW.FROM; i <= Character.ASCII.LOW.TO; ++i) {
|
|
15833
|
+
var ac = String.fromCodePoint(i);
|
|
15834
|
+
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
15835
|
+
}
|
|
15836
|
+
for (var i = Character.ASCII.HIGH.FROM; i <= Character.ASCII.HIGH.TO; ++i) {
|
|
15837
|
+
var ac = String.fromCodePoint(i);
|
|
15793
15838
|
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
15794
15839
|
}
|
|
15795
15840
|
this._characters = characters;
|
|
@@ -32415,21 +32460,13 @@ var UtilCharacterIterator = /** @class */ (function () {
|
|
|
32415
32460
|
var iend = target.length;
|
|
32416
32461
|
for (var i = istart; i < iend; ++i) {
|
|
32417
32462
|
var code = target.charCodeAt(i);
|
|
32418
|
-
if (!
|
|
32463
|
+
if (!(Character.SURROGATE.LOW.FROM <= code && code <= Character.SURROGATE.LOW.TO) &&
|
|
32464
|
+
!(Character.VARIATION.FROM <= code && code <= Character.VARIATION.TO)) {
|
|
32419
32465
|
return i;
|
|
32420
32466
|
}
|
|
32421
32467
|
}
|
|
32422
32468
|
return iend;
|
|
32423
32469
|
};
|
|
32424
|
-
UtilCharacterIterator.prototype.isHighSurrogate = function (code) {
|
|
32425
|
-
return 0xd800 <= code && code <= 0xdbff;
|
|
32426
|
-
};
|
|
32427
|
-
UtilCharacterIterator.prototype.isLowSurrogate = function (code) {
|
|
32428
|
-
return 0xdc00 <= code && code <= 0xdfff;
|
|
32429
|
-
};
|
|
32430
|
-
UtilCharacterIterator.prototype.isVariationSelector = function (code) {
|
|
32431
|
-
return 0xfe00 <= code && code <= 0xfe0f;
|
|
32432
|
-
};
|
|
32433
32470
|
UtilCharacterIterator.prototype.next = function () {
|
|
32434
32471
|
var target = this.target;
|
|
32435
32472
|
var position = this.position;
|
|
@@ -73946,8 +73983,12 @@ var DynamicFontAtlas = /** @class */ (function () {
|
|
|
73946
73983
|
characters.set(Character.SPACE, this.newChar(Character.SPACE, DynamicFontAtlasCharacterType.SPACE_R));
|
|
73947
73984
|
characters.set(Character.TAB, this.newChar(Character.SOFT_TAB, DynamicFontAtlasCharacterType.SPACE_R));
|
|
73948
73985
|
characters.set(Character.DOTS, this.newChar(Character.DOTS, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
73949
|
-
for (var i =
|
|
73950
|
-
var ac =
|
|
73986
|
+
for (var i = Character.ASCII.LOW.FROM; i <= Character.ASCII.LOW.TO; ++i) {
|
|
73987
|
+
var ac = String.fromCodePoint(i);
|
|
73988
|
+
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
73989
|
+
}
|
|
73990
|
+
for (var i = Character.ASCII.HIGH.FROM; i <= Character.ASCII.HIGH.TO; ++i) {
|
|
73991
|
+
var ac = String.fromCodePoint(i);
|
|
73951
73992
|
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
73952
73993
|
}
|
|
73953
73994
|
this._characters = characters;
|
|
@@ -74018,15 +74059,18 @@ var DynamicFontAtlas = /** @class */ (function () {
|
|
|
74018
74059
|
var cs = this._characters;
|
|
74019
74060
|
var cds = this._createds;
|
|
74020
74061
|
for (var i = 0, imax = characters.length; i < imax;) {
|
|
74021
|
-
|
|
74062
|
+
var icc = characters.charCodeAt(i);
|
|
74063
|
+
if ((Character.ASCII.LOW.FROM <= icc && icc <= Character.ASCII.LOW.TO) ||
|
|
74064
|
+
(Character.ASCII.HIGH.FROM <= icc && icc <= Character.ASCII.HIGH.TO)) {
|
|
74022
74065
|
// Ignore ASCII characters
|
|
74023
74066
|
i += 1;
|
|
74024
74067
|
continue;
|
|
74025
74068
|
}
|
|
74026
74069
|
var j = i + 1;
|
|
74027
74070
|
for (; j < imax; ++j) {
|
|
74028
|
-
var
|
|
74029
|
-
if ((
|
|
74071
|
+
var jcc = characters.charCodeAt(j);
|
|
74072
|
+
if ((Character.SURROGATE.LOW.FROM <= jcc && jcc <= Character.SURROGATE.LOW.TO) ||
|
|
74073
|
+
(Character.VARIATION.FROM <= jcc && jcc <= Character.VARIATION.TO)) {
|
|
74030
74074
|
// Low surrogate
|
|
74031
74075
|
// Variation selector
|
|
74032
74076
|
continue;
|
|
@@ -74064,15 +74108,18 @@ var DynamicFontAtlas = /** @class */ (function () {
|
|
|
74064
74108
|
DynamicFontAtlas.prototype.remove = function (characters) {
|
|
74065
74109
|
var cs = this._characters;
|
|
74066
74110
|
for (var i = 0, imax = characters.length; i < imax;) {
|
|
74067
|
-
|
|
74111
|
+
var icc = characters.charCodeAt(i);
|
|
74112
|
+
if ((Character.ASCII.LOW.FROM <= icc && icc <= Character.ASCII.LOW.TO) ||
|
|
74113
|
+
(Character.ASCII.HIGH.FROM <= icc && icc <= Character.ASCII.HIGH.TO)) {
|
|
74068
74114
|
// Ignore ASCII characters
|
|
74069
74115
|
i += 1;
|
|
74070
74116
|
continue;
|
|
74071
74117
|
}
|
|
74072
74118
|
var j = i + 1;
|
|
74073
74119
|
for (; j < imax; ++j) {
|
|
74074
|
-
var
|
|
74075
|
-
if ((
|
|
74120
|
+
var jcc = characters.charCodeAt(j);
|
|
74121
|
+
if ((Character.SURROGATE.LOW.FROM <= jcc && jcc <= Character.SURROGATE.LOW.TO) ||
|
|
74122
|
+
(Character.VARIATION.FROM <= jcc && jcc <= Character.VARIATION.TO)) {
|
|
74076
74123
|
// Low surrogate
|
|
74077
74124
|
// Variation selector
|
|
74078
74125
|
continue;
|
package/dist/wcardinal-ui.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
Winter Cardinal UI v0.457.
|
|
2
|
+
Winter Cardinal UI v0.457.2
|
|
3
3
|
Copyright (C) 2019 Toshiba Corporation
|
|
4
4
|
SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
|
|
@@ -418,7 +418,41 @@
|
|
|
418
418
|
* SPDX-License-Identifier: Apache-2.0
|
|
419
419
|
*/
|
|
420
420
|
var Character = {
|
|
421
|
-
|
|
421
|
+
/**
|
|
422
|
+
* ASCII Character Ranges
|
|
423
|
+
* LOW: Printable ASCII (0x21-0x7E) - '!' to '~'
|
|
424
|
+
* HIGH: Extended ASCII (0xA1-0xFF) - '¡' to 'ÿ'
|
|
425
|
+
*/
|
|
426
|
+
ASCII: {
|
|
427
|
+
LOW: {
|
|
428
|
+
FROM: 0x21,
|
|
429
|
+
TO: 0x7e
|
|
430
|
+
},
|
|
431
|
+
HIGH: {
|
|
432
|
+
FROM: 0xa1,
|
|
433
|
+
TO: 0xff
|
|
434
|
+
}
|
|
435
|
+
},
|
|
436
|
+
/**
|
|
437
|
+
* Surrogate Pair Ranges
|
|
438
|
+
*/
|
|
439
|
+
SURROGATE: {
|
|
440
|
+
LOW: {
|
|
441
|
+
FROM: 0xdc00,
|
|
442
|
+
TO: 0xdfff
|
|
443
|
+
},
|
|
444
|
+
HIGH: {
|
|
445
|
+
FROM: 0xd800,
|
|
446
|
+
TO: 0xdbff
|
|
447
|
+
}
|
|
448
|
+
},
|
|
449
|
+
/**
|
|
450
|
+
* Variation Selector Range
|
|
451
|
+
*/
|
|
452
|
+
VARIATION: {
|
|
453
|
+
FROM: 0xfe00,
|
|
454
|
+
TO: 0xfe0f
|
|
455
|
+
},
|
|
422
456
|
SPACE: " ",
|
|
423
457
|
TAB: "\t",
|
|
424
458
|
SOFT_TAB: " ",
|
|
@@ -7815,7 +7849,9 @@
|
|
|
7815
7849
|
var nacharactersLength = nacharacters.length;
|
|
7816
7850
|
var inacharacters = 0;
|
|
7817
7851
|
for (var i = 0, imax = value.length; i < imax;) {
|
|
7818
|
-
|
|
7852
|
+
var icc = value.charCodeAt(i);
|
|
7853
|
+
if ((Character.ASCII.LOW.FROM <= icc && icc <= Character.ASCII.LOW.TO) ||
|
|
7854
|
+
(Character.ASCII.HIGH.FROM <= icc && icc <= Character.ASCII.HIGH.TO)) {
|
|
7819
7855
|
// Add an ASCII character
|
|
7820
7856
|
var ac = value.substring(i, i + 1);
|
|
7821
7857
|
if (icharacters < charactersLength) {
|
|
@@ -7830,8 +7866,9 @@
|
|
|
7830
7866
|
}
|
|
7831
7867
|
var j = i + 1;
|
|
7832
7868
|
for (; j < imax; ++j) {
|
|
7833
|
-
var
|
|
7834
|
-
if ((
|
|
7869
|
+
var jcc = value.charCodeAt(j);
|
|
7870
|
+
if ((Character.SURROGATE.LOW.FROM <= jcc && jcc <= Character.SURROGATE.LOW.TO) ||
|
|
7871
|
+
(Character.VARIATION.FROM <= jcc && jcc <= Character.VARIATION.TO)) {
|
|
7835
7872
|
// Low surrogate
|
|
7836
7873
|
// Variation selector
|
|
7837
7874
|
continue;
|
|
@@ -13410,8 +13447,12 @@
|
|
|
13410
13447
|
this.onFillChange();
|
|
13411
13448
|
};
|
|
13412
13449
|
EShapePointsMarkerBase.prototype.copy = function (source) {
|
|
13450
|
+
this.lock();
|
|
13451
|
+
this.type = source.type;
|
|
13413
13452
|
var size = source.size;
|
|
13414
|
-
this.set(
|
|
13453
|
+
this.size.set(size.x, size.y);
|
|
13454
|
+
this.fill.copy(source.fill);
|
|
13455
|
+
this.unlock();
|
|
13415
13456
|
return this;
|
|
13416
13457
|
};
|
|
13417
13458
|
EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
|
|
@@ -15785,8 +15826,12 @@
|
|
|
15785
15826
|
characters.set(Character.SPACE, this.newChar(Character.SPACE, DynamicFontAtlasCharacterType.SPACE_R));
|
|
15786
15827
|
characters.set(Character.TAB, this.newChar(Character.SOFT_TAB, DynamicFontAtlasCharacterType.SPACE_R));
|
|
15787
15828
|
characters.set(Character.DOTS, this.newChar(Character.DOTS, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
15788
|
-
for (var i =
|
|
15789
|
-
var ac =
|
|
15829
|
+
for (var i = Character.ASCII.LOW.FROM; i <= Character.ASCII.LOW.TO; ++i) {
|
|
15830
|
+
var ac = String.fromCodePoint(i);
|
|
15831
|
+
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
15832
|
+
}
|
|
15833
|
+
for (var i = Character.ASCII.HIGH.FROM; i <= Character.ASCII.HIGH.TO; ++i) {
|
|
15834
|
+
var ac = String.fromCodePoint(i);
|
|
15790
15835
|
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
15791
15836
|
}
|
|
15792
15837
|
this._characters = characters;
|
|
@@ -32412,21 +32457,13 @@
|
|
|
32412
32457
|
var iend = target.length;
|
|
32413
32458
|
for (var i = istart; i < iend; ++i) {
|
|
32414
32459
|
var code = target.charCodeAt(i);
|
|
32415
|
-
if (!
|
|
32460
|
+
if (!(Character.SURROGATE.LOW.FROM <= code && code <= Character.SURROGATE.LOW.TO) &&
|
|
32461
|
+
!(Character.VARIATION.FROM <= code && code <= Character.VARIATION.TO)) {
|
|
32416
32462
|
return i;
|
|
32417
32463
|
}
|
|
32418
32464
|
}
|
|
32419
32465
|
return iend;
|
|
32420
32466
|
};
|
|
32421
|
-
UtilCharacterIterator.prototype.isHighSurrogate = function (code) {
|
|
32422
|
-
return 0xd800 <= code && code <= 0xdbff;
|
|
32423
|
-
};
|
|
32424
|
-
UtilCharacterIterator.prototype.isLowSurrogate = function (code) {
|
|
32425
|
-
return 0xdc00 <= code && code <= 0xdfff;
|
|
32426
|
-
};
|
|
32427
|
-
UtilCharacterIterator.prototype.isVariationSelector = function (code) {
|
|
32428
|
-
return 0xfe00 <= code && code <= 0xfe0f;
|
|
32429
|
-
};
|
|
32430
32467
|
UtilCharacterIterator.prototype.next = function () {
|
|
32431
32468
|
var target = this.target;
|
|
32432
32469
|
var position = this.position;
|
|
@@ -51983,8 +52020,12 @@
|
|
|
51983
52020
|
characters.set(Character.SPACE, this.newChar(Character.SPACE, DynamicFontAtlasCharacterType.SPACE_R));
|
|
51984
52021
|
characters.set(Character.TAB, this.newChar(Character.SOFT_TAB, DynamicFontAtlasCharacterType.SPACE_R));
|
|
51985
52022
|
characters.set(Character.DOTS, this.newChar(Character.DOTS, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
51986
|
-
for (var i =
|
|
51987
|
-
var ac =
|
|
52023
|
+
for (var i = Character.ASCII.LOW.FROM; i <= Character.ASCII.LOW.TO; ++i) {
|
|
52024
|
+
var ac = String.fromCodePoint(i);
|
|
52025
|
+
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
52026
|
+
}
|
|
52027
|
+
for (var i = Character.ASCII.HIGH.FROM; i <= Character.ASCII.HIGH.TO; ++i) {
|
|
52028
|
+
var ac = String.fromCodePoint(i);
|
|
51988
52029
|
characters.set(ac, this.newChar(ac, DynamicFontAtlasCharacterType.LETTER_RNB));
|
|
51989
52030
|
}
|
|
51990
52031
|
this._characters = characters;
|
|
@@ -52055,15 +52096,18 @@
|
|
|
52055
52096
|
var cs = this._characters;
|
|
52056
52097
|
var cds = this._createds;
|
|
52057
52098
|
for (var i = 0, imax = characters.length; i < imax;) {
|
|
52058
|
-
|
|
52099
|
+
var icc = characters.charCodeAt(i);
|
|
52100
|
+
if ((Character.ASCII.LOW.FROM <= icc && icc <= Character.ASCII.LOW.TO) ||
|
|
52101
|
+
(Character.ASCII.HIGH.FROM <= icc && icc <= Character.ASCII.HIGH.TO)) {
|
|
52059
52102
|
// Ignore ASCII characters
|
|
52060
52103
|
i += 1;
|
|
52061
52104
|
continue;
|
|
52062
52105
|
}
|
|
52063
52106
|
var j = i + 1;
|
|
52064
52107
|
for (; j < imax; ++j) {
|
|
52065
|
-
var
|
|
52066
|
-
if ((
|
|
52108
|
+
var jcc = characters.charCodeAt(j);
|
|
52109
|
+
if ((Character.SURROGATE.LOW.FROM <= jcc && jcc <= Character.SURROGATE.LOW.TO) ||
|
|
52110
|
+
(Character.VARIATION.FROM <= jcc && jcc <= Character.VARIATION.TO)) {
|
|
52067
52111
|
// Low surrogate
|
|
52068
52112
|
// Variation selector
|
|
52069
52113
|
continue;
|
|
@@ -52101,15 +52145,18 @@
|
|
|
52101
52145
|
DynamicFontAtlas.prototype.remove = function (characters) {
|
|
52102
52146
|
var cs = this._characters;
|
|
52103
52147
|
for (var i = 0, imax = characters.length; i < imax;) {
|
|
52104
|
-
|
|
52148
|
+
var icc = characters.charCodeAt(i);
|
|
52149
|
+
if ((Character.ASCII.LOW.FROM <= icc && icc <= Character.ASCII.LOW.TO) ||
|
|
52150
|
+
(Character.ASCII.HIGH.FROM <= icc && icc <= Character.ASCII.HIGH.TO)) {
|
|
52105
52151
|
// Ignore ASCII characters
|
|
52106
52152
|
i += 1;
|
|
52107
52153
|
continue;
|
|
52108
52154
|
}
|
|
52109
52155
|
var j = i + 1;
|
|
52110
52156
|
for (; j < imax; ++j) {
|
|
52111
|
-
var
|
|
52112
|
-
if ((
|
|
52157
|
+
var jcc = characters.charCodeAt(j);
|
|
52158
|
+
if ((Character.SURROGATE.LOW.FROM <= jcc && jcc <= Character.SURROGATE.LOW.TO) ||
|
|
52159
|
+
(Character.VARIATION.FROM <= jcc && jcc <= Character.VARIATION.TO)) {
|
|
52113
52160
|
// Low surrogate
|
|
52114
52161
|
// Variation selector
|
|
52115
52162
|
continue;
|