@vitessce/all 3.5.11 → 3.6.0
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/{blosc-537fd004.js → blosc-B8fjEpk7.js} +2 -5
- package/dist/{browser-122c4c35.js → browser-CwsEWr7C.js} +4 -6
- package/dist/deflate-DGQmLV1M.js +10 -0
- package/dist/{gzip-6a24f0fe.js → gzip-BcpOCWcu.js} +2 -5
- package/dist/{higlass-5022c0ac.js → higlass-CGZsUecg.js} +1492 -1960
- package/dist/{index-b2384476.js → index-Bhk2pxIQ.js} +232497 -204015
- package/dist/{index-9fa0b8f0.js → index-Cd_6CW6r.js} +6808 -6871
- package/dist/{index-1de95a31.js → index-Mspmyvat.js} +14018 -14281
- package/dist/index.js +8 -10
- package/dist/{jpeg-8687eb38.js → jpeg-dJOgo5O4.js} +20 -4
- package/dist/lerc-GDpFLh9n.js +2013 -0
- package/dist/{lz4-bbd18009.js → lz4-C9lm_i9S.js} +2 -5
- package/dist/{lzw-ffd426d3.js → lzw-Dny2Bc0l.js} +1 -4
- package/dist/{packbits-3388263e.js → packbits-CxuQnKHa.js} +1 -4
- package/dist/{pako.esm-68f84e2a.js → pako.esm-SxljTded.js} +33 -1839
- package/dist/{raw-7ad8e084.js → raw-CphAtlVX.js} +1 -4
- package/dist/{troika-three-text.esm-1b1516c6.js → troika-three-text.esm-D9oTslue.js} +278 -519
- package/dist/{webimage-60247a11.js → webimage-BLxZhJWS.js} +1 -4
- package/dist/{zlib-175cd38d.js → zlib-ZTk3sZPP.js} +2 -5
- package/dist/{zstd-561fda0e.js → zstd-y75FARxZ.js} +2 -5
- package/package.json +33 -33
- package/dist/deflate-916bb37d.js +0 -13
- package/dist/lerc-42867a4a.js +0 -2006
- /package/dist/{chunk-INHXZS53-bee20a28.js → chunk-INHXZS53-DHVJiuU3.js} +0 -0
@@ -1,22 +1,16 @@
|
|
1
|
-
import {
|
2
|
-
import "react";
|
3
|
-
import "@vitessce/vit-s";
|
4
|
-
import "react-dom";
|
1
|
+
import { bA as MeshDistanceMaterial, bB as MeshDepthMaterial, bC as RGBADepthPacking, aB as UniformsUtils, bD as ShaderChunk, aw as InstancedBufferGeometry, av as Sphere, au as Box3, aH as BackSide, a9 as DoubleSide, ad as Mesh, as as FrontSide, aa as MeshBasicMaterial, i as Color, c as Vector3, k as Matrix4, d as Vector2, aJ as Matrix3, aD as Vector4, T as Texture, a1 as LinearFilter, bE as PlaneGeometry, f as BufferGeometry, ax as Float32BufferAttribute, bF as InstancedBufferAttribute } from "./index-Bhk2pxIQ.js";
|
5
2
|
function workerBootstrap() {
|
6
3
|
var modules = /* @__PURE__ */ Object.create(null);
|
7
4
|
function registerModule(ref, callback) {
|
8
5
|
var id = ref.id;
|
9
6
|
var name = ref.name;
|
10
7
|
var dependencies = ref.dependencies;
|
11
|
-
if (dependencies === void 0)
|
12
|
-
dependencies = [];
|
8
|
+
if (dependencies === void 0) dependencies = [];
|
13
9
|
var init = ref.init;
|
14
|
-
if (init === void 0)
|
15
|
-
|
16
|
-
};
|
10
|
+
if (init === void 0) init = function() {
|
11
|
+
};
|
17
12
|
var getTransferables = ref.getTransferables;
|
18
|
-
if (getTransferables === void 0)
|
19
|
-
getTransferables = null;
|
13
|
+
if (getTransferables === void 0) getTransferables = null;
|
20
14
|
if (modules[id]) {
|
21
15
|
return;
|
22
16
|
}
|
@@ -159,8 +153,7 @@ function workerBootstrap() {
|
|
159
153
|
function defineMainThreadModule(options) {
|
160
154
|
var moduleFunc = function() {
|
161
155
|
var args = [], len = arguments.length;
|
162
|
-
while (len--)
|
163
|
-
args[len] = arguments[len];
|
156
|
+
while (len--) args[len] = arguments[len];
|
164
157
|
return moduleFunc._getInitResult().then(function(initResult) {
|
165
158
|
if (typeof initResult === "function") {
|
166
159
|
return initResult.apply(void 0, args);
|
@@ -197,9 +190,7 @@ var supportsWorkers = function() {
|
|
197
190
|
worker.terminate();
|
198
191
|
supported = true;
|
199
192
|
} catch (err) {
|
200
|
-
|
201
|
-
;
|
202
|
-
else {
|
193
|
+
{
|
203
194
|
console.log(
|
204
195
|
"Troika createWorkerModule: web workers not allowed; falling back to main thread execution. Cause: [" + err.message + "]"
|
205
196
|
);
|
@@ -251,8 +242,7 @@ function defineWorkerModule(options) {
|
|
251
242
|
});
|
252
243
|
function moduleFunc() {
|
253
244
|
var args = [], len = arguments.length;
|
254
|
-
while (len--)
|
255
|
-
args[len] = arguments[len];
|
245
|
+
while (len--) args[len] = arguments[len];
|
256
246
|
if (!registrationPromise) {
|
257
247
|
registrationPromise = callWorker(workerId, "registerModule", moduleFunc.workerModuleData);
|
258
248
|
var unregister = function() {
|
@@ -386,8 +376,7 @@ function SDFGenerator() {
|
|
386
376
|
}
|
387
377
|
}
|
388
378
|
function pathToLineSegments(pathString, segmentCallback, curvePoints) {
|
389
|
-
if (curvePoints === void 0)
|
390
|
-
curvePoints = 16;
|
379
|
+
if (curvePoints === void 0) curvePoints = 16;
|
391
380
|
var tempPoint = { x: 0, y: 0 };
|
392
381
|
forEachPathCommand(pathString, function(command, startX, startY, endX, endY, ctrl1X, ctrl1Y, ctrl2X, ctrl2Y) {
|
393
382
|
switch (command) {
|
@@ -481,8 +470,7 @@ function SDFGenerator() {
|
|
481
470
|
func2({
|
482
471
|
setUniform: function setUniform(type, name2) {
|
483
472
|
var values = [], len = arguments.length - 2;
|
484
|
-
while (len-- > 0)
|
485
|
-
values[len] = arguments[len + 2];
|
473
|
+
while (len-- > 0) values[len] = arguments[len + 2];
|
486
474
|
var uniformLoc = uniforms[name2] || (uniforms[name2] = gl.getUniformLocation(program, name2));
|
487
475
|
gl["uniform" + type].apply(gl, [uniformLoc].concat(values));
|
488
476
|
},
|
@@ -573,10 +561,8 @@ function SDFGenerator() {
|
|
573
561
|
callback(wrapper);
|
574
562
|
}
|
575
563
|
function renderImageData(glOrCanvas, imageData, x, y, width, height, channels, framebuffer) {
|
576
|
-
if (channels === void 0)
|
577
|
-
|
578
|
-
if (framebuffer === void 0)
|
579
|
-
framebuffer = null;
|
564
|
+
if (channels === void 0) channels = 15;
|
565
|
+
if (framebuffer === void 0) framebuffer = null;
|
580
566
|
withWebGLContext(glOrCanvas, function(ref) {
|
581
567
|
var gl = ref.gl;
|
582
568
|
var withProgram = ref.withProgram;
|
@@ -617,8 +603,7 @@ function SDFGenerator() {
|
|
617
603
|
resizeWebGLCanvasWithoutClearing: resizeWebGLCanvasWithoutClearing2
|
618
604
|
});
|
619
605
|
function generate$2(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent) {
|
620
|
-
if (sdfExponent === void 0)
|
621
|
-
sdfExponent = 1;
|
606
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
622
607
|
var textureData = new Uint8Array(sdfWidth * sdfHeight);
|
623
608
|
var viewBoxWidth = viewBox[2] - viewBox[0];
|
624
609
|
var viewBoxHeight = viewBox[3] - viewBox[1];
|
@@ -690,25 +675,17 @@ function SDFGenerator() {
|
|
690
675
|
}
|
691
676
|
}
|
692
677
|
function generateIntoCanvas$2(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, x, y, channel) {
|
693
|
-
if (sdfExponent === void 0)
|
694
|
-
|
695
|
-
if (
|
696
|
-
|
697
|
-
if (y === void 0)
|
698
|
-
y = 0;
|
699
|
-
if (channel === void 0)
|
700
|
-
channel = 0;
|
678
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
679
|
+
if (x === void 0) x = 0;
|
680
|
+
if (y === void 0) y = 0;
|
681
|
+
if (channel === void 0) channel = 0;
|
701
682
|
generateIntoFramebuffer$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, null, x, y, channel);
|
702
683
|
}
|
703
684
|
function generateIntoFramebuffer$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, glOrCanvas, framebuffer, x, y, channel) {
|
704
|
-
if (sdfExponent === void 0)
|
705
|
-
|
706
|
-
if (
|
707
|
-
|
708
|
-
if (y === void 0)
|
709
|
-
y = 0;
|
710
|
-
if (channel === void 0)
|
711
|
-
channel = 0;
|
685
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
686
|
+
if (x === void 0) x = 0;
|
687
|
+
if (y === void 0) y = 0;
|
688
|
+
if (channel === void 0) channel = 0;
|
712
689
|
var data = generate$2(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent);
|
713
690
|
var rgbaData = new Uint8Array(data.length * 4);
|
714
691
|
for (var i = 0; i < data.length; i++) {
|
@@ -745,10 +722,8 @@ function SDFGenerator() {
|
|
745
722
|
}
|
746
723
|
}
|
747
724
|
function generate$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, glOrCanvas) {
|
748
|
-
if (sdfExponent === void 0)
|
749
|
-
|
750
|
-
if (glOrCanvas === void 0)
|
751
|
-
glOrCanvas = null;
|
725
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
726
|
+
if (glOrCanvas === void 0) glOrCanvas = null;
|
752
727
|
if (!glOrCanvas) {
|
753
728
|
glOrCanvas = implicitContext;
|
754
729
|
if (!glOrCanvas) {
|
@@ -793,25 +768,17 @@ function SDFGenerator() {
|
|
793
768
|
return data;
|
794
769
|
}
|
795
770
|
function generateIntoCanvas$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, x, y, channel) {
|
796
|
-
if (sdfExponent === void 0)
|
797
|
-
|
798
|
-
if (
|
799
|
-
|
800
|
-
if (y === void 0)
|
801
|
-
y = 0;
|
802
|
-
if (channel === void 0)
|
803
|
-
channel = 0;
|
771
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
772
|
+
if (x === void 0) x = 0;
|
773
|
+
if (y === void 0) y = 0;
|
774
|
+
if (channel === void 0) channel = 0;
|
804
775
|
generateIntoFramebuffer(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, null, x, y, channel);
|
805
776
|
}
|
806
777
|
function generateIntoFramebuffer(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, glOrCanvas, framebuffer, x, y, channel) {
|
807
|
-
if (sdfExponent === void 0)
|
808
|
-
|
809
|
-
if (
|
810
|
-
|
811
|
-
if (y === void 0)
|
812
|
-
y = 0;
|
813
|
-
if (channel === void 0)
|
814
|
-
channel = 0;
|
778
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
779
|
+
if (x === void 0) x = 0;
|
780
|
+
if (y === void 0) y = 0;
|
781
|
+
if (channel === void 0) channel = 0;
|
815
782
|
validateSupport(glOrCanvas);
|
816
783
|
var lineSegmentCoords = [];
|
817
784
|
pathToLineSegments(path, function(x1, y1, x2, y2) {
|
@@ -943,10 +910,8 @@ function SDFGenerator() {
|
|
943
910
|
isSupported
|
944
911
|
});
|
945
912
|
function generate(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent) {
|
946
|
-
if (maxDistance === void 0)
|
947
|
-
|
948
|
-
if (sdfExponent === void 0)
|
949
|
-
sdfExponent = 1;
|
913
|
+
if (maxDistance === void 0) maxDistance = Math.max(viewBox[2] - viewBox[0], viewBox[3] - viewBox[1]) / 2;
|
914
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
950
915
|
try {
|
951
916
|
return generate$1.apply(webgl, arguments);
|
952
917
|
} catch (e) {
|
@@ -955,16 +920,11 @@ function SDFGenerator() {
|
|
955
920
|
}
|
956
921
|
}
|
957
922
|
function generateIntoCanvas(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, x, y, channel) {
|
958
|
-
if (maxDistance === void 0)
|
959
|
-
|
960
|
-
if (
|
961
|
-
|
962
|
-
if (
|
963
|
-
x = 0;
|
964
|
-
if (y === void 0)
|
965
|
-
y = 0;
|
966
|
-
if (channel === void 0)
|
967
|
-
channel = 0;
|
923
|
+
if (maxDistance === void 0) maxDistance = Math.max(viewBox[2] - viewBox[0], viewBox[3] - viewBox[1]) / 2;
|
924
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
925
|
+
if (x === void 0) x = 0;
|
926
|
+
if (y === void 0) y = 0;
|
927
|
+
if (channel === void 0) channel = 0;
|
968
928
|
try {
|
969
929
|
return generateIntoCanvas$1.apply(webgl, arguments);
|
970
930
|
} catch (e) {
|
@@ -1044,8 +1004,7 @@ function bidiFactory() {
|
|
1044
1004
|
});
|
1045
1005
|
}
|
1046
1006
|
};
|
1047
|
-
for (var type in DATA)
|
1048
|
-
loop(type);
|
1007
|
+
for (var type in DATA) loop(type);
|
1049
1008
|
}
|
1050
1009
|
}
|
1051
1010
|
function getBidiCharType(char) {
|
@@ -1919,10 +1878,8 @@ function createDerivedMaterial(baseMaterial, options) {
|
|
1919
1878
|
configurable: true,
|
1920
1879
|
value() {
|
1921
1880
|
const { _depthMaterial, _distanceMaterial } = this;
|
1922
|
-
if (_depthMaterial)
|
1923
|
-
|
1924
|
-
if (_distanceMaterial)
|
1925
|
-
_distanceMaterial.dispose();
|
1881
|
+
if (_depthMaterial) _depthMaterial.dispose();
|
1882
|
+
if (_distanceMaterial) _distanceMaterial.dispose();
|
1926
1883
|
baseMaterial.dispose.call(this);
|
1927
1884
|
}
|
1928
1885
|
}
|
@@ -2090,8 +2047,7 @@ function typrFactory() {
|
|
2090
2047
|
var h = n.readASCII(r2, s, 4);
|
2091
2048
|
s += 4, n.readUint(r2, s), s += 4;
|
2092
2049
|
var d = n.readUint(r2, s);
|
2093
|
-
if (s += 4, n.readUint(r2, s), s += 4, h == t2)
|
2094
|
-
return d;
|
2050
|
+
if (s += 4, n.readUint(r2, s), s += 4, h == t2) return d;
|
2095
2051
|
}
|
2096
2052
|
return 0;
|
2097
2053
|
} };
|
@@ -2108,16 +2064,14 @@ function typrFactory() {
|
|
2108
2064
|
}, readUshort: function(r2, t2) {
|
2109
2065
|
return e._bin._view(r2).getUint16(t2);
|
2110
2066
|
}, readUshorts: function(r2, t2, a2) {
|
2111
|
-
for (var n = [], o = 0; o < a2; o++)
|
2112
|
-
n.push(e._bin.readUshort(r2, t2 + 2 * o));
|
2067
|
+
for (var n = [], o = 0; o < a2; o++) n.push(e._bin.readUshort(r2, t2 + 2 * o));
|
2113
2068
|
return n;
|
2114
2069
|
}, readUint: function(r2, t2) {
|
2115
2070
|
return e._bin._view(r2).getUint32(t2);
|
2116
2071
|
}, readUint64: function(r2, t2) {
|
2117
2072
|
return 4294967296 * e._bin.readUint(r2, t2) + e._bin.readUint(r2, t2 + 4);
|
2118
2073
|
}, readASCII: function(r2, e2, t2) {
|
2119
|
-
for (var a2 = "", n = 0; n < t2; n++)
|
2120
|
-
a2 += String.fromCharCode(r2[e2 + n]);
|
2074
|
+
for (var a2 = "", n = 0; n < t2; n++) a2 += String.fromCharCode(r2[e2 + n]);
|
2121
2075
|
return a2;
|
2122
2076
|
}, readUnicode: function(r2, e2, t2) {
|
2123
2077
|
for (var a2 = "", n = 0; n < t2; n++) {
|
@@ -2129,12 +2083,10 @@ function typrFactory() {
|
|
2129
2083
|
var n = e._bin._tdec;
|
2130
2084
|
return n && 0 == t2 && a2 == r2.length ? n.decode(r2) : e._bin.readASCII(r2, t2, a2);
|
2131
2085
|
}, readBytes: function(r2, e2, t2) {
|
2132
|
-
for (var a2 = [], n = 0; n < t2; n++)
|
2133
|
-
a2.push(r2[e2 + n]);
|
2086
|
+
for (var a2 = [], n = 0; n < t2; n++) a2.push(r2[e2 + n]);
|
2134
2087
|
return a2;
|
2135
2088
|
}, readASCIIArray: function(r2, e2, t2) {
|
2136
|
-
for (var a2 = [], n = 0; n < t2; n++)
|
2137
|
-
a2.push(String.fromCharCode(r2[e2 + n]));
|
2089
|
+
for (var a2 = [], n = 0; n < t2; n++) a2.push(String.fromCharCode(r2[e2 + n]));
|
2138
2090
|
return a2;
|
2139
2091
|
}, _view: function(r2) {
|
2140
2092
|
return r2._dataView || (r2._dataView = r2.buffer ? new DataView(r2.buffer, r2.byteOffset, r2.byteLength) : new DataView(new Uint8Array(r2).buffer));
|
@@ -2170,8 +2122,7 @@ function typrFactory() {
|
|
2170
2122
|
}
|
2171
2123
|
return s;
|
2172
2124
|
}, e._lctf.numOfOnes = function(r2) {
|
2173
|
-
for (var e2 = 0, t2 = 0; t2 < 32; t2++)
|
2174
|
-
0 != (r2 >>> t2 & 1) && e2++;
|
2125
|
+
for (var e2 = 0, t2 = 0; t2 < 32; t2++) 0 != (r2 >>> t2 & 1) && e2++;
|
2175
2126
|
return e2;
|
2176
2127
|
}, e._lctf.readClassDef = function(r2, t2) {
|
2177
2128
|
var a2 = e._bin, n = [], o = a2.readUshort(r2, t2);
|
@@ -2180,21 +2131,18 @@ function typrFactory() {
|
|
2180
2131
|
t2 += 2;
|
2181
2132
|
var i = a2.readUshort(r2, t2);
|
2182
2133
|
t2 += 2;
|
2183
|
-
for (var h = 0; h < i; h++)
|
2184
|
-
n.push(s + h), n.push(s + h), n.push(a2.readUshort(r2, t2)), t2 += 2;
|
2134
|
+
for (var h = 0; h < i; h++) n.push(s + h), n.push(s + h), n.push(a2.readUshort(r2, t2)), t2 += 2;
|
2185
2135
|
}
|
2186
2136
|
if (2 == o) {
|
2187
2137
|
var d = a2.readUshort(r2, t2);
|
2188
2138
|
t2 += 2;
|
2189
|
-
for (h = 0; h < d; h++)
|
2190
|
-
n.push(a2.readUshort(r2, t2)), t2 += 2, n.push(a2.readUshort(r2, t2)), t2 += 2, n.push(a2.readUshort(r2, t2)), t2 += 2;
|
2139
|
+
for (h = 0; h < d; h++) n.push(a2.readUshort(r2, t2)), t2 += 2, n.push(a2.readUshort(r2, t2)), t2 += 2, n.push(a2.readUshort(r2, t2)), t2 += 2;
|
2191
2140
|
}
|
2192
2141
|
return n;
|
2193
2142
|
}, e._lctf.getInterval = function(r2, e2) {
|
2194
2143
|
for (var t2 = 0; t2 < r2.length; t2 += 3) {
|
2195
2144
|
var a2 = r2[t2], n = r2[t2 + 1];
|
2196
|
-
if (r2[t2 + 2], a2 <= e2 && e2 <= n)
|
2197
|
-
return t2;
|
2145
|
+
if (r2[t2 + 2], a2 <= e2 && e2 <= n) return t2;
|
2198
2146
|
}
|
2199
2147
|
return -1;
|
2200
2148
|
}, e._lctf.readCoverage = function(r2, t2) {
|
@@ -2204,12 +2152,10 @@ function typrFactory() {
|
|
2204
2152
|
return t2 += 2, 1 == n.fmt && (n.tab = a2.readUshorts(r2, t2, o)), 2 == n.fmt && (n.tab = a2.readUshorts(r2, t2, 3 * o)), n;
|
2205
2153
|
}, e._lctf.coverageIndex = function(r2, t2) {
|
2206
2154
|
var a2 = r2.tab;
|
2207
|
-
if (1 == r2.fmt)
|
2208
|
-
return a2.indexOf(t2);
|
2155
|
+
if (1 == r2.fmt) return a2.indexOf(t2);
|
2209
2156
|
if (2 == r2.fmt) {
|
2210
2157
|
var n = e._lctf.getInterval(a2, t2);
|
2211
|
-
if (-1 != n)
|
2212
|
-
return a2[n + 2] + (t2 - a2[n]);
|
2158
|
+
if (-1 != n) return a2[n + 2] + (t2 - a2[n]);
|
2213
2159
|
}
|
2214
2160
|
return -1;
|
2215
2161
|
}, e._lctf.readFeatureList = function(r2, t2) {
|
@@ -2229,8 +2175,7 @@ function typrFactory() {
|
|
2229
2175
|
t2 += 2, s > 0 && (o.featureParams = n + s);
|
2230
2176
|
var i = a2.readUshort(r2, t2);
|
2231
2177
|
t2 += 2, o.tab = [];
|
2232
|
-
for (var h = 0; h < i; h++)
|
2233
|
-
o.tab.push(a2.readUshort(r2, t2 + 2 * h));
|
2178
|
+
for (var h = 0; h < i; h++) o.tab.push(a2.readUshort(r2, t2 + 2 * h));
|
2234
2179
|
return o;
|
2235
2180
|
}, e._lctf.readScriptList = function(r2, t2) {
|
2236
2181
|
var a2 = e._bin, n = t2, o = {}, s = a2.readUshort(r2, t2);
|
@@ -2264,27 +2209,23 @@ function typrFactory() {
|
|
2264
2209
|
(r2 = new Uint8Array(r2.buffer, t2, a2))[t2 = 0], r2[++t2], r2[++t2], r2[++t2], t2++;
|
2265
2210
|
var o = [];
|
2266
2211
|
t2 = e.CFF.readIndex(r2, t2, o);
|
2267
|
-
for (var s = [], i = 0; i < o.length - 1; i++)
|
2268
|
-
s.push(n.readASCII(r2, t2 + o[i], o[i + 1] - o[i]));
|
2212
|
+
for (var s = [], i = 0; i < o.length - 1; i++) s.push(n.readASCII(r2, t2 + o[i], o[i + 1] - o[i]));
|
2269
2213
|
t2 += o[o.length - 1];
|
2270
2214
|
var h = [];
|
2271
2215
|
t2 = e.CFF.readIndex(r2, t2, h);
|
2272
2216
|
var d = [];
|
2273
|
-
for (i = 0; i < h.length - 1; i++)
|
2274
|
-
d.push(e.CFF.readDict(r2, t2 + h[i], t2 + h[i + 1]));
|
2217
|
+
for (i = 0; i < h.length - 1; i++) d.push(e.CFF.readDict(r2, t2 + h[i], t2 + h[i + 1]));
|
2275
2218
|
t2 += h[h.length - 1];
|
2276
2219
|
var f = d[0], u = [];
|
2277
2220
|
t2 = e.CFF.readIndex(r2, t2, u);
|
2278
2221
|
var l = [];
|
2279
|
-
for (i = 0; i < u.length - 1; i++)
|
2280
|
-
l.push(n.readASCII(r2, t2 + u[i], u[i + 1] - u[i]));
|
2222
|
+
for (i = 0; i < u.length - 1; i++) l.push(n.readASCII(r2, t2 + u[i], u[i + 1] - u[i]));
|
2281
2223
|
if (t2 += u[u.length - 1], e.CFF.readSubrs(r2, t2, f), f.CharStrings) {
|
2282
2224
|
t2 = f.CharStrings;
|
2283
2225
|
u = [];
|
2284
2226
|
t2 = e.CFF.readIndex(r2, t2, u);
|
2285
2227
|
var v = [];
|
2286
|
-
for (i = 0; i < u.length - 1; i++)
|
2287
|
-
v.push(n.readBytes(r2, t2 + u[i], u[i + 1] - u[i]));
|
2228
|
+
for (i = 0; i < u.length - 1; i++) v.push(n.readBytes(r2, t2 + u[i], u[i + 1] - u[i]));
|
2288
2229
|
f.CharStrings = v;
|
2289
2230
|
}
|
2290
2231
|
if (f.ROS) {
|
@@ -2297,75 +2238,57 @@ function typrFactory() {
|
|
2297
2238
|
}
|
2298
2239
|
t2 += c[c.length - 1], t2 = f.FDSelect, f.FDSelect = [];
|
2299
2240
|
var U = r2[t2];
|
2300
|
-
if (t2++, 3 != U)
|
2301
|
-
throw U;
|
2241
|
+
if (t2++, 3 != U) throw U;
|
2302
2242
|
var g = n.readUshort(r2, t2);
|
2303
2243
|
t2 += 2;
|
2304
|
-
for (i = 0; i < g + 1; i++)
|
2305
|
-
f.FDSelect.push(n.readUshort(r2, t2), r2[t2 + 2]), t2 += 3;
|
2244
|
+
for (i = 0; i < g + 1; i++) f.FDSelect.push(n.readUshort(r2, t2), r2[t2 + 2]), t2 += 3;
|
2306
2245
|
}
|
2307
2246
|
return f.Encoding && (f.Encoding = e.CFF.readEncoding(r2, f.Encoding, f.CharStrings.length)), f.charset && (f.charset = e.CFF.readCharset(r2, f.charset, f.CharStrings.length)), e.CFF._readFDict(r2, f, l), f;
|
2308
2247
|
}, e.CFF._readFDict = function(r2, t2, a2) {
|
2309
2248
|
var n;
|
2310
|
-
for (var o in t2.Private && (n = t2.Private[1], t2.Private = e.CFF.readDict(r2, n, n + t2.Private[0]), t2.Private.Subrs && e.CFF.readSubrs(r2, n + t2.Private.Subrs, t2.Private)), t2)
|
2311
|
-
-1 != ["FamilyName", "FontName", "FullName", "Notice", "version", "Copyright"].indexOf(o) && (t2[o] = a2[t2[o] - 426 + 35]);
|
2249
|
+
for (var o in t2.Private && (n = t2.Private[1], t2.Private = e.CFF.readDict(r2, n, n + t2.Private[0]), t2.Private.Subrs && e.CFF.readSubrs(r2, n + t2.Private.Subrs, t2.Private)), t2) -1 != ["FamilyName", "FontName", "FullName", "Notice", "version", "Copyright"].indexOf(o) && (t2[o] = a2[t2[o] - 426 + 35]);
|
2312
2250
|
}, e.CFF.readSubrs = function(r2, t2, a2) {
|
2313
2251
|
var n = e._bin, o = [];
|
2314
2252
|
t2 = e.CFF.readIndex(r2, t2, o);
|
2315
2253
|
var s, i = o.length;
|
2316
2254
|
s = i < 1240 ? 107 : i < 33900 ? 1131 : 32768, a2.Bias = s, a2.Subrs = [];
|
2317
|
-
for (var h = 0; h < o.length - 1; h++)
|
2318
|
-
a2.Subrs.push(n.readBytes(r2, t2 + o[h], o[h + 1] - o[h]));
|
2255
|
+
for (var h = 0; h < o.length - 1; h++) a2.Subrs.push(n.readBytes(r2, t2 + o[h], o[h + 1] - o[h]));
|
2319
2256
|
}, e.CFF.tableSE = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 0, 111, 112, 113, 114, 0, 115, 116, 117, 118, 119, 120, 121, 122, 0, 123, 0, 124, 125, 126, 127, 128, 129, 130, 131, 0, 132, 133, 0, 134, 135, 136, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 138, 0, 139, 0, 0, 0, 0, 140, 141, 142, 143, 0, 0, 0, 0, 0, 144, 0, 0, 0, 145, 0, 0, 146, 147, 148, 149, 0, 0, 0, 0], e.CFF.glyphByUnicode = function(r2, e2) {
|
2320
|
-
for (var t2 = 0; t2 < r2.charset.length; t2++)
|
2321
|
-
if (r2.charset[t2] == e2)
|
2322
|
-
return t2;
|
2257
|
+
for (var t2 = 0; t2 < r2.charset.length; t2++) if (r2.charset[t2] == e2) return t2;
|
2323
2258
|
return -1;
|
2324
2259
|
}, e.CFF.glyphBySE = function(r2, t2) {
|
2325
2260
|
return t2 < 0 || t2 > 255 ? -1 : e.CFF.glyphByUnicode(r2, e.CFF.tableSE[t2]);
|
2326
2261
|
}, e.CFF.readEncoding = function(r2, t2, a2) {
|
2327
2262
|
e._bin;
|
2328
2263
|
var n = [".notdef"], o = r2[t2];
|
2329
|
-
if (t2++, 0 != o)
|
2330
|
-
throw "error: unknown encoding format: " + o;
|
2264
|
+
if (t2++, 0 != o) throw "error: unknown encoding format: " + o;
|
2331
2265
|
var s = r2[t2];
|
2332
2266
|
t2++;
|
2333
|
-
for (var i = 0; i < s; i++)
|
2334
|
-
n.push(r2[t2 + i]);
|
2267
|
+
for (var i = 0; i < s; i++) n.push(r2[t2 + i]);
|
2335
2268
|
return n;
|
2336
2269
|
}, e.CFF.readCharset = function(r2, t2, a2) {
|
2337
2270
|
var n = e._bin, o = [".notdef"], s = r2[t2];
|
2338
|
-
if (t2++, 0 == s)
|
2339
|
-
|
2340
|
-
|
2341
|
-
|
2342
|
-
}
|
2271
|
+
if (t2++, 0 == s) for (var i = 0; i < a2; i++) {
|
2272
|
+
var h = n.readUshort(r2, t2);
|
2273
|
+
t2 += 2, o.push(h);
|
2274
|
+
}
|
2343
2275
|
else {
|
2344
|
-
if (1 != s && 2 != s)
|
2345
|
-
throw "error: format: " + s;
|
2276
|
+
if (1 != s && 2 != s) throw "error: format: " + s;
|
2346
2277
|
for (; o.length < a2; ) {
|
2347
2278
|
h = n.readUshort(r2, t2);
|
2348
2279
|
t2 += 2;
|
2349
2280
|
var d = 0;
|
2350
2281
|
1 == s ? (d = r2[t2], t2++) : (d = n.readUshort(r2, t2), t2 += 2);
|
2351
|
-
for (i = 0; i <= d; i++)
|
2352
|
-
o.push(h), h++;
|
2282
|
+
for (i = 0; i <= d; i++) o.push(h), h++;
|
2353
2283
|
}
|
2354
2284
|
}
|
2355
2285
|
return o;
|
2356
2286
|
}, e.CFF.readIndex = function(r2, t2, a2) {
|
2357
2287
|
var n = e._bin, o = n.readUshort(r2, t2) + 1, s = r2[t2 += 2];
|
2358
|
-
if (t2++, 1 == s)
|
2359
|
-
|
2360
|
-
|
2361
|
-
else if (
|
2362
|
-
for (i = 0; i < o; i++)
|
2363
|
-
a2.push(n.readUshort(r2, t2 + 2 * i));
|
2364
|
-
else if (3 == s)
|
2365
|
-
for (i = 0; i < o; i++)
|
2366
|
-
a2.push(16777215 & n.readUint(r2, t2 + 3 * i - 1));
|
2367
|
-
else if (1 != o)
|
2368
|
-
throw "unsupported offset size: " + s + ", count: " + o;
|
2288
|
+
if (t2++, 1 == s) for (var i = 0; i < o; i++) a2.push(r2[t2 + i]);
|
2289
|
+
else if (2 == s) for (i = 0; i < o; i++) a2.push(n.readUshort(r2, t2 + 2 * i));
|
2290
|
+
else if (3 == s) for (i = 0; i < o; i++) a2.push(16777215 & n.readUint(r2, t2 + 3 * i - 1));
|
2291
|
+
else if (1 != o) throw "unsupported offset size: " + s + ", count: " + o;
|
2369
2292
|
return (t2 += o * s) - 1;
|
2370
2293
|
}, e.CFF.getCharString = function(r2, t2, a2) {
|
2371
2294
|
var n = e._bin, o = r2[t2], s = r2[t2 + 1];
|
@@ -2385,24 +2308,20 @@ function typrFactory() {
|
|
2385
2308
|
var i = r2[t2], h = r2[t2 + 1];
|
2386
2309
|
r2[t2 + 2], r2[t2 + 3], r2[t2 + 4];
|
2387
2310
|
var d = 1, f = null, u = null;
|
2388
|
-
if (28 == i && (u = n.readShort(r2, t2 + 1), d = 3), 29 == i && (u = n.readInt(r2, t2 + 1), d = 5), 32 <= i && i <= 246 && (u = i - 139, d = 1), 247 <= i && i <= 250 && (u = 256 * (i - 247) + h + 108, d = 2), 251 <= i && i <= 254 && (u = 256 * -(i - 251) - h - 108, d = 2), 255 == i)
|
2389
|
-
throw u = n.readInt(r2, t2 + 1) / 65535, d = 5, "unknown number";
|
2311
|
+
if (28 == i && (u = n.readShort(r2, t2 + 1), d = 3), 29 == i && (u = n.readInt(r2, t2 + 1), d = 5), 32 <= i && i <= 246 && (u = i - 139, d = 1), 247 <= i && i <= 250 && (u = 256 * (i - 247) + h + 108, d = 2), 251 <= i && i <= 254 && (u = 256 * -(i - 251) - h - 108, d = 2), 255 == i) throw u = n.readInt(r2, t2 + 1) / 65535, d = 5, "unknown number";
|
2390
2312
|
if (30 == i) {
|
2391
2313
|
var l = [];
|
2392
2314
|
for (d = 1; ; ) {
|
2393
2315
|
var v = r2[t2 + d];
|
2394
2316
|
d++;
|
2395
2317
|
var c = v >> 4, p = 15 & v;
|
2396
|
-
if (15 != c && l.push(c), 15 != p && l.push(p), 15 == p)
|
2397
|
-
break;
|
2318
|
+
if (15 != c && l.push(c), 15 != p && l.push(p), 15 == p) break;
|
2398
2319
|
}
|
2399
|
-
for (var U = "", g = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ".", "e", "e-", "reserved", "-", "endOfNumber"], S = 0; S < l.length; S++)
|
2400
|
-
U += g[l[S]];
|
2320
|
+
for (var U = "", g = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ".", "e", "e-", "reserved", "-", "endOfNumber"], S = 0; S < l.length; S++) U += g[l[S]];
|
2401
2321
|
u = parseFloat(U);
|
2402
2322
|
}
|
2403
2323
|
if (i <= 21) {
|
2404
|
-
if (f = ["version", "Notice", "FullName", "FamilyName", "Weight", "FontBBox", "BlueValues", "OtherBlues", "FamilyBlues", "FamilyOtherBlues", "StdHW", "StdVW", "escape", "UniqueID", "XUID", "charset", "Encoding", "CharStrings", "Private", "Subrs", "defaultWidthX", "nominalWidthX"][i], d = 1, 12 == i)
|
2405
|
-
f = ["Copyright", "isFixedPitch", "ItalicAngle", "UnderlinePosition", "UnderlineThickness", "PaintType", "CharstringType", "FontMatrix", "StrokeWidth", "BlueScale", "BlueShift", "BlueFuzz", "StemSnapH", "StemSnapV", "ForceBold", 0, 0, "LanguageGroup", "ExpansionFactor", "initialRandomSeed", "SyntheticBase", "PostScript", "BaseFontName", "BaseFontBlend", 0, 0, 0, 0, 0, 0, "ROS", "CIDFontVersion", "CIDFontRevision", "CIDFontType", "CIDCount", "UIDBase", "FDArray", "FDSelect", "FontName"][h], d = 2;
|
2324
|
+
if (f = ["version", "Notice", "FullName", "FamilyName", "Weight", "FontBBox", "BlueValues", "OtherBlues", "FamilyBlues", "FamilyOtherBlues", "StdHW", "StdVW", "escape", "UniqueID", "XUID", "charset", "Encoding", "CharStrings", "Private", "Subrs", "defaultWidthX", "nominalWidthX"][i], d = 1, 12 == i) f = ["Copyright", "isFixedPitch", "ItalicAngle", "UnderlinePosition", "UnderlineThickness", "PaintType", "CharstringType", "FontMatrix", "StrokeWidth", "BlueScale", "BlueShift", "BlueFuzz", "StemSnapH", "StemSnapV", "ForceBold", 0, 0, "LanguageGroup", "ExpansionFactor", "initialRandomSeed", "SyntheticBase", "PostScript", "BaseFontName", "BaseFontBlend", 0, 0, 0, 0, 0, 0, "ROS", "CIDFontVersion", "CIDFontRevision", "CIDFontType", "CIDCount", "UIDBase", "FDArray", "FDSelect", "FontName"][h], d = 2;
|
2406
2325
|
}
|
2407
2326
|
null != f ? (o[f] = 1 == s.length ? s[0] : s, s = []) : s.push(u), t2 += d;
|
2408
2327
|
}
|
@@ -2429,8 +2348,7 @@ function typrFactory() {
|
|
2429
2348
|
var p = n.readUshort(r2, u);
|
2430
2349
|
0 == p ? c = e.cmap.parse0(r2, u) : 4 == p ? c = e.cmap.parse4(r2, u) : 6 == p ? c = e.cmap.parse6(r2, u) : 12 == p ? c = e.cmap.parse12(r2, u) : console.debug("unknown format: " + p, d, f, u), o.tables.push(c);
|
2431
2350
|
}
|
2432
|
-
if (null != o[l])
|
2433
|
-
throw "multiple tables for one platform+encoding";
|
2351
|
+
if (null != o[l]) throw "multiple tables for one platform+encoding";
|
2434
2352
|
o[l] = v;
|
2435
2353
|
}
|
2436
2354
|
return o;
|
@@ -2439,8 +2357,7 @@ function typrFactory() {
|
|
2439
2357
|
n.format = a2.readUshort(r2, t2), t2 += 2;
|
2440
2358
|
var o = a2.readUshort(r2, t2);
|
2441
2359
|
t2 += 2, a2.readUshort(r2, t2), t2 += 2, n.map = [];
|
2442
|
-
for (var s = 0; s < o - 6; s++)
|
2443
|
-
n.map.push(r2[t2 + s]);
|
2360
|
+
for (var s = 0; s < o - 6; s++) n.map.push(r2[t2 + s]);
|
2444
2361
|
return n;
|
2445
2362
|
}, e.cmap.parse4 = function(r2, t2) {
|
2446
2363
|
var a2 = e._bin, n = t2, o = {};
|
@@ -2451,18 +2368,15 @@ function typrFactory() {
|
|
2451
2368
|
t2 += 2;
|
2452
2369
|
var h = i / 2;
|
2453
2370
|
o.searchRange = a2.readUshort(r2, t2), t2 += 2, o.entrySelector = a2.readUshort(r2, t2), t2 += 2, o.rangeShift = a2.readUshort(r2, t2), t2 += 2, o.endCount = a2.readUshorts(r2, t2, h), t2 += 2 * h, t2 += 2, o.startCount = a2.readUshorts(r2, t2, h), t2 += 2 * h, o.idDelta = [];
|
2454
|
-
for (var d = 0; d < h; d++)
|
2455
|
-
|
2456
|
-
for (o.idRangeOffset = a2.readUshorts(r2, t2, h), t2 += 2 * h, o.glyphIdArray = []; t2 < n + s; )
|
2457
|
-
o.glyphIdArray.push(a2.readUshort(r2, t2)), t2 += 2;
|
2371
|
+
for (var d = 0; d < h; d++) o.idDelta.push(a2.readShort(r2, t2)), t2 += 2;
|
2372
|
+
for (o.idRangeOffset = a2.readUshorts(r2, t2, h), t2 += 2 * h, o.glyphIdArray = []; t2 < n + s; ) o.glyphIdArray.push(a2.readUshort(r2, t2)), t2 += 2;
|
2458
2373
|
return o;
|
2459
2374
|
}, e.cmap.parse6 = function(r2, t2) {
|
2460
2375
|
var a2 = e._bin, n = {};
|
2461
2376
|
n.format = a2.readUshort(r2, t2), t2 += 2, a2.readUshort(r2, t2), t2 += 2, a2.readUshort(r2, t2), t2 += 2, n.firstCode = a2.readUshort(r2, t2), t2 += 2;
|
2462
2377
|
var o = a2.readUshort(r2, t2);
|
2463
2378
|
t2 += 2, n.glyphIdArray = [];
|
2464
|
-
for (var s = 0; s < o; s++)
|
2465
|
-
n.glyphIdArray.push(a2.readUshort(r2, t2)), t2 += 2;
|
2379
|
+
for (var s = 0; s < o; s++) n.glyphIdArray.push(a2.readUshort(r2, t2)), t2 += 2;
|
2466
2380
|
return n;
|
2467
2381
|
}, e.cmap.parse12 = function(r2, t2) {
|
2468
2382
|
var a2 = e._bin, n = {};
|
@@ -2475,23 +2389,18 @@ function typrFactory() {
|
|
2475
2389
|
}
|
2476
2390
|
return n;
|
2477
2391
|
}, e.glyf = {}, e.glyf.parse = function(r2, e2, t2, a2) {
|
2478
|
-
for (var n = [], o = 0; o < a2.maxp.numGlyphs; o++)
|
2479
|
-
n.push(null);
|
2392
|
+
for (var n = [], o = 0; o < a2.maxp.numGlyphs; o++) n.push(null);
|
2480
2393
|
return n;
|
2481
2394
|
}, e.glyf._parseGlyf = function(r2, t2) {
|
2482
2395
|
var a2 = e._bin, n = r2._data, o = e._tabOffset(n, "glyf", r2._offset) + r2.loca[t2];
|
2483
|
-
if (r2.loca[t2] == r2.loca[t2 + 1])
|
2484
|
-
return null;
|
2396
|
+
if (r2.loca[t2] == r2.loca[t2 + 1]) return null;
|
2485
2397
|
var s = {};
|
2486
|
-
if (s.noc = a2.readShort(n, o), o += 2, s.xMin = a2.readShort(n, o), o += 2, s.yMin = a2.readShort(n, o), o += 2, s.xMax = a2.readShort(n, o), o += 2, s.yMax = a2.readShort(n, o), o += 2, s.xMin >= s.xMax || s.yMin >= s.yMax)
|
2487
|
-
return null;
|
2398
|
+
if (s.noc = a2.readShort(n, o), o += 2, s.xMin = a2.readShort(n, o), o += 2, s.yMin = a2.readShort(n, o), o += 2, s.xMax = a2.readShort(n, o), o += 2, s.yMax = a2.readShort(n, o), o += 2, s.xMin >= s.xMax || s.yMin >= s.yMax) return null;
|
2488
2399
|
if (s.noc > 0) {
|
2489
2400
|
s.endPts = [];
|
2490
|
-
for (var i = 0; i < s.noc; i++)
|
2491
|
-
s.endPts.push(a2.readUshort(n, o)), o += 2;
|
2401
|
+
for (var i = 0; i < s.noc; i++) s.endPts.push(a2.readUshort(n, o)), o += 2;
|
2492
2402
|
var h = a2.readUshort(n, o);
|
2493
|
-
if (o += 2, n.length - o < h)
|
2494
|
-
return null;
|
2403
|
+
if (o += 2, n.length - o < h) return null;
|
2495
2404
|
s.instructions = a2.readBytes(n, o, h), o += h;
|
2496
2405
|
var d = s.endPts[s.noc - 1] + 1;
|
2497
2406
|
s.flags = [];
|
@@ -2500,8 +2409,7 @@ function typrFactory() {
|
|
2500
2409
|
if (o++, s.flags.push(f), 0 != (8 & f)) {
|
2501
2410
|
var u = n[o];
|
2502
2411
|
o++;
|
2503
|
-
for (var l = 0; l < u; l++)
|
2504
|
-
s.flags.push(f), i++;
|
2412
|
+
for (var l = 0; l < u; l++) s.flags.push(f), i++;
|
2505
2413
|
}
|
2506
2414
|
}
|
2507
2415
|
s.xs = [];
|
@@ -2515,8 +2423,7 @@ function typrFactory() {
|
|
2515
2423
|
v ? (s.ys.push(c ? n[o] : -n[o]), o++) : c ? s.ys.push(0) : (s.ys.push(a2.readShort(n, o)), o += 2);
|
2516
2424
|
}
|
2517
2425
|
var p = 0, U = 0;
|
2518
|
-
for (i = 0; i < d; i++)
|
2519
|
-
p += s.xs[i], U += s.ys[i], s.xs[i] = p, s.ys[i] = U;
|
2426
|
+
for (i = 0; i < d; i++) p += s.xs[i], U += s.ys[i], s.xs[i] = p, s.ys[i] = U;
|
2520
2427
|
} else {
|
2521
2428
|
var g;
|
2522
2429
|
s.parts = [];
|
@@ -2539,8 +2446,7 @@ function typrFactory() {
|
|
2539
2446
|
if (256 & g) {
|
2540
2447
|
var y = a2.readUshort(n, o);
|
2541
2448
|
o += 2, s.instr = [];
|
2542
|
-
for (i = 0; i < y; i++)
|
2543
|
-
s.instr.push(n[o]), o++;
|
2449
|
+
for (i = 0; i < y; i++) s.instr.push(n[o]), o++;
|
2544
2450
|
}
|
2545
2451
|
}
|
2546
2452
|
return s;
|
@@ -2600,19 +2506,15 @@ function typrFactory() {
|
|
2600
2506
|
i.matrix.push(_);
|
2601
2507
|
}
|
2602
2508
|
}
|
2603
|
-
} else if (4 == t2 && 1 == i.fmt)
|
2604
|
-
|
2605
|
-
else if (6 == t2 && 1 == i.fmt)
|
2606
|
-
i.mark1Coverage = e._lctf.readCoverage(r2, o.readUshort(r2, a2) + s), i.mark2Coverage = e._lctf.readCoverage(r2, o.readUshort(r2, a2 + 2) + s), i.markClassCount = o.readUshort(r2, a2 + 4), i.mark1Array = e.GPOS.readMarkArray(r2, o.readUshort(r2, a2 + 6) + s), i.mark2Array = e.GPOS.readBaseArray(r2, o.readUshort(r2, a2 + 8) + s, i.markClassCount);
|
2509
|
+
} else if (4 == t2 && 1 == i.fmt) i.markCoverage = e._lctf.readCoverage(r2, o.readUshort(r2, a2) + s), i.baseCoverage = e._lctf.readCoverage(r2, o.readUshort(r2, a2 + 2) + s), i.markClassCount = o.readUshort(r2, a2 + 4), i.markArray = e.GPOS.readMarkArray(r2, o.readUshort(r2, a2 + 6) + s), i.baseArray = e.GPOS.readBaseArray(r2, o.readUshort(r2, a2 + 8) + s, i.markClassCount);
|
2510
|
+
else if (6 == t2 && 1 == i.fmt) i.mark1Coverage = e._lctf.readCoverage(r2, o.readUshort(r2, a2) + s), i.mark2Coverage = e._lctf.readCoverage(r2, o.readUshort(r2, a2 + 2) + s), i.markClassCount = o.readUshort(r2, a2 + 4), i.mark1Array = e.GPOS.readMarkArray(r2, o.readUshort(r2, a2 + 6) + s), i.mark2Array = e.GPOS.readBaseArray(r2, o.readUshort(r2, a2 + 8) + s, i.markClassCount);
|
2607
2511
|
else {
|
2608
2512
|
if (9 == t2 && 1 == i.fmt) {
|
2609
2513
|
var I = o.readUshort(r2, a2);
|
2610
2514
|
a2 += 2;
|
2611
2515
|
var w = o.readUint(r2, a2);
|
2612
|
-
if (a2 += 4, 9 == n.ltype)
|
2613
|
-
|
2614
|
-
else if (n.ltype != I)
|
2615
|
-
throw "invalid extension substitution";
|
2516
|
+
if (a2 += 4, 9 == n.ltype) n.ltype = I;
|
2517
|
+
else if (n.ltype != I) throw "invalid extension substitution";
|
2616
2518
|
return e.GPOS.subt(r2, n.ltype, s + w);
|
2617
2519
|
}
|
2618
2520
|
console.debug("unsupported GPOS table LookupType", t2, "format", i.fmt);
|
@@ -2625,8 +2527,7 @@ function typrFactory() {
|
|
2625
2527
|
var n = e._bin, o = [], s = t2, i = n.readUshort(r2, t2);
|
2626
2528
|
t2 += 2;
|
2627
2529
|
for (var h = 0; h < i; h++) {
|
2628
|
-
for (var d = [], f = 0; f < a2; f++)
|
2629
|
-
d.push(e.GPOS.readAnchorRecord(r2, s + n.readUshort(r2, t2))), t2 += 2;
|
2530
|
+
for (var d = [], f = 0; f < a2; f++) d.push(e.GPOS.readAnchorRecord(r2, s + n.readUshort(r2, t2))), t2 += 2;
|
2630
2531
|
o.push(d);
|
2631
2532
|
}
|
2632
2533
|
return o;
|
@@ -2645,15 +2546,13 @@ function typrFactory() {
|
|
2645
2546
|
return e._lctf.parse(r2, t2, a2, n, e.GSUB.subt);
|
2646
2547
|
}, e.GSUB.subt = function(r2, t2, a2, n) {
|
2647
2548
|
var o = e._bin, s = a2, i = {};
|
2648
|
-
if (i.fmt = o.readUshort(r2, a2), a2 += 2, 1 != t2 && 2 != t2 && 4 != t2 && 5 != t2 && 6 != t2)
|
2649
|
-
return null;
|
2549
|
+
if (i.fmt = o.readUshort(r2, a2), a2 += 2, 1 != t2 && 2 != t2 && 4 != t2 && 5 != t2 && 6 != t2) return null;
|
2650
2550
|
if (1 == t2 || 2 == t2 || 4 == t2 || 5 == t2 && i.fmt <= 2 || 6 == t2 && i.fmt <= 2) {
|
2651
2551
|
var h = o.readUshort(r2, a2);
|
2652
2552
|
a2 += 2, i.coverage = e._lctf.readCoverage(r2, s + h);
|
2653
2553
|
}
|
2654
2554
|
if (1 == t2 && i.fmt >= 1 && i.fmt <= 2) {
|
2655
|
-
if (1 == i.fmt)
|
2656
|
-
i.delta = o.readShort(r2, a2), a2 += 2;
|
2555
|
+
if (1 == i.fmt) i.delta = o.readShort(r2, a2), a2 += 2;
|
2657
2556
|
else if (2 == i.fmt) {
|
2658
2557
|
var d = o.readUshort(r2, a2);
|
2659
2558
|
a2 += 2, i.newg = o.readUshorts(r2, a2, d), a2 += 2 * i.newg.length;
|
@@ -2691,8 +2590,7 @@ function typrFactory() {
|
|
2691
2590
|
for (f = 0; f < 3; f++) {
|
2692
2591
|
d = o.readUshort(r2, a2);
|
2693
2592
|
a2 += 2;
|
2694
|
-
for (var g = [], S = 0; S < d; S++)
|
2695
|
-
g.push(e._lctf.readCoverage(r2, s + o.readUshort(r2, a2 + 2 * S)));
|
2593
|
+
for (var g = [], S = 0; S < d; S++) g.push(e._lctf.readCoverage(r2, s + o.readUshort(r2, a2 + 2 * S)));
|
2696
2594
|
a2 += 2 * d, 0 == f && (i.backCvg = g), 1 == f && (i.inptCvg = g), 2 == f && (i.ahedCvg = g);
|
2697
2595
|
}
|
2698
2596
|
d = o.readUshort(r2, a2);
|
@@ -2703,10 +2601,8 @@ function typrFactory() {
|
|
2703
2601
|
var m = o.readUshort(r2, a2);
|
2704
2602
|
a2 += 2;
|
2705
2603
|
var b = o.readUint(r2, a2);
|
2706
|
-
if (a2 += 4, 9 == n.ltype)
|
2707
|
-
|
2708
|
-
else if (n.ltype != m)
|
2709
|
-
throw "invalid extension substitution";
|
2604
|
+
if (a2 += 4, 9 == n.ltype) n.ltype = m;
|
2605
|
+
else if (n.ltype != m) throw "invalid extension substitution";
|
2710
2606
|
return e.GSUB.subt(r2, n.ltype, s + b);
|
2711
2607
|
}
|
2712
2608
|
console.debug("unsupported GSUB table LookupType", t2, "format", i.fmt);
|
@@ -2723,12 +2619,10 @@ function typrFactory() {
|
|
2723
2619
|
}, e.GSUB.readSubClassRule = function(r2, t2) {
|
2724
2620
|
var a2 = e._bin.readUshort, n = {}, o = a2(r2, t2), s = a2(r2, t2 += 2);
|
2725
2621
|
t2 += 2, n.input = [];
|
2726
|
-
for (var i = 0; i < o - 1; i++)
|
2727
|
-
n.input.push(a2(r2, t2)), t2 += 2;
|
2622
|
+
for (var i = 0; i < o - 1; i++) n.input.push(a2(r2, t2)), t2 += 2;
|
2728
2623
|
return n.substLookupRecords = e.GSUB.readSubstLookupRecords(r2, t2, s), n;
|
2729
2624
|
}, e.GSUB.readSubstLookupRecords = function(r2, t2, a2) {
|
2730
|
-
for (var n = e._bin.readUshort, o = [], s = 0; s < a2; s++)
|
2731
|
-
o.push(n(r2, t2), n(r2, t2 + 2)), t2 += 4;
|
2625
|
+
for (var n = e._bin.readUshort, o = [], s = 0; s < a2; s++) o.push(n(r2, t2), n(r2, t2 + 2)), t2 += 4;
|
2732
2626
|
return o;
|
2733
2627
|
}, e.GSUB.readChainSubClassSet = function(r2, t2) {
|
2734
2628
|
var a2 = e._bin, n = t2, o = [], s = a2.readUshort(r2, t2);
|
@@ -2758,8 +2652,7 @@ function typrFactory() {
|
|
2758
2652
|
n.nglyph = a2.readUshort(r2, t2), t2 += 2;
|
2759
2653
|
var o = a2.readUshort(r2, t2);
|
2760
2654
|
t2 += 2;
|
2761
|
-
for (var s = 0; s < o - 1; s++)
|
2762
|
-
n.chain.push(a2.readUshort(r2, t2)), t2 += 2;
|
2655
|
+
for (var s = 0; s < o - 1; s++) n.chain.push(a2.readUshort(r2, t2)), t2 += 2;
|
2763
2656
|
return n;
|
2764
2657
|
}, e.head = {}, e.head.parse = function(r2, t2, a2) {
|
2765
2658
|
var n = e._bin, o = {};
|
@@ -2768,13 +2661,11 @@ function typrFactory() {
|
|
2768
2661
|
var n = e._bin, o = {};
|
2769
2662
|
return n.readFixed(r2, t2), t2 += 4, o.ascender = n.readShort(r2, t2), t2 += 2, o.descender = n.readShort(r2, t2), t2 += 2, o.lineGap = n.readShort(r2, t2), t2 += 2, o.advanceWidthMax = n.readUshort(r2, t2), t2 += 2, o.minLeftSideBearing = n.readShort(r2, t2), t2 += 2, o.minRightSideBearing = n.readShort(r2, t2), t2 += 2, o.xMaxExtent = n.readShort(r2, t2), t2 += 2, o.caretSlopeRise = n.readShort(r2, t2), t2 += 2, o.caretSlopeRun = n.readShort(r2, t2), t2 += 2, o.caretOffset = n.readShort(r2, t2), t2 += 2, t2 += 8, o.metricDataFormat = n.readShort(r2, t2), t2 += 2, o.numberOfHMetrics = n.readUshort(r2, t2), t2 += 2, o;
|
2770
2663
|
}, e.hmtx = {}, e.hmtx.parse = function(r2, t2, a2, n) {
|
2771
|
-
for (var o = e._bin, s = { aWidth: [], lsBearing: [] }, i = 0, h = 0, d = 0; d < n.maxp.numGlyphs; d++)
|
2772
|
-
d < n.hhea.numberOfHMetrics && (i = o.readUshort(r2, t2), t2 += 2, h = o.readShort(r2, t2), t2 += 2), s.aWidth.push(i), s.lsBearing.push(h);
|
2664
|
+
for (var o = e._bin, s = { aWidth: [], lsBearing: [] }, i = 0, h = 0, d = 0; d < n.maxp.numGlyphs; d++) d < n.hhea.numberOfHMetrics && (i = o.readUshort(r2, t2), t2 += 2, h = o.readShort(r2, t2), t2 += 2), s.aWidth.push(i), s.lsBearing.push(h);
|
2773
2665
|
return s;
|
2774
2666
|
}, e.kern = {}, e.kern.parse = function(r2, t2, a2, n) {
|
2775
2667
|
var o = e._bin, s = o.readUshort(r2, t2);
|
2776
|
-
if (t2 += 2, 1 == s)
|
2777
|
-
return e.kern.parseV1(r2, t2 - 2, a2, n);
|
2668
|
+
if (t2 += 2, 1 == s) return e.kern.parseV1(r2, t2 - 2, a2, n);
|
2778
2669
|
var i = o.readUshort(r2, t2);
|
2779
2670
|
t2 += 2;
|
2780
2671
|
for (var h = { glyph1: [], rval: [] }, d = 0; d < i; d++) {
|
@@ -2784,8 +2675,7 @@ function typrFactory() {
|
|
2784
2675
|
var f = o.readUshort(r2, t2);
|
2785
2676
|
t2 += 2;
|
2786
2677
|
var u = f >>> 8;
|
2787
|
-
if (0 != (u &= 15))
|
2788
|
-
throw "unknown kern table format: " + u;
|
2678
|
+
if (0 != (u &= 15)) throw "unknown kern table format: " + u;
|
2789
2679
|
t2 = e.kern.readFormat0(r2, t2, h);
|
2790
2680
|
}
|
2791
2681
|
return h;
|
@@ -2799,8 +2689,7 @@ function typrFactory() {
|
|
2799
2689
|
var d = o.readUshort(r2, t2);
|
2800
2690
|
t2 += 2, o.readUshort(r2, t2), t2 += 2;
|
2801
2691
|
var f = d >>> 8;
|
2802
|
-
if (0 != (f &= 15))
|
2803
|
-
throw "unknown kern table format: " + f;
|
2692
|
+
if (0 != (f &= 15)) throw "unknown kern table format: " + f;
|
2804
2693
|
t2 = e.kern.readFormat0(r2, t2, i);
|
2805
2694
|
}
|
2806
2695
|
return i;
|
@@ -2820,12 +2709,8 @@ function typrFactory() {
|
|
2820
2709
|
return t2;
|
2821
2710
|
}, e.loca = {}, e.loca.parse = function(r2, t2, a2, n) {
|
2822
2711
|
var o = e._bin, s = [], i = n.head.indexToLocFormat, h = n.maxp.numGlyphs + 1;
|
2823
|
-
if (0 == i)
|
2824
|
-
|
2825
|
-
s.push(o.readUshort(r2, t2 + (d << 1)) << 1);
|
2826
|
-
if (1 == i)
|
2827
|
-
for (d = 0; d < h; d++)
|
2828
|
-
s.push(o.readUint(r2, t2 + (d << 2)));
|
2712
|
+
if (0 == i) for (var d = 0; d < h; d++) s.push(o.readUshort(r2, t2 + (d << 1)) << 1);
|
2713
|
+
if (1 == i) for (d = 0; d < h; d++) s.push(o.readUint(r2, t2 + (d << 2)));
|
2829
2714
|
return s;
|
2830
2715
|
}, e.maxp = {}, e.maxp.parse = function(r2, t2, a2) {
|
2831
2716
|
var n = e._bin, o = {}, s = n.readUint(r2, t2);
|
@@ -2849,36 +2734,22 @@ function typrFactory() {
|
|
2849
2734
|
var U = n.readUshort(r2, t2);
|
2850
2735
|
t2 += 2;
|
2851
2736
|
var g, S = h[c], m = d + 12 * s + U;
|
2852
|
-
if (0 == u)
|
2853
|
-
|
2854
|
-
else if (
|
2855
|
-
|
2856
|
-
else if (
|
2857
|
-
g = n.readASCII(r2, m, p);
|
2858
|
-
else if (1 == l)
|
2859
|
-
g = n.readUnicode(r2, m, p / 2);
|
2860
|
-
else if (3 == l)
|
2861
|
-
g = n.readUnicode(r2, m, p / 2);
|
2737
|
+
if (0 == u) g = n.readUnicode(r2, m, p / 2);
|
2738
|
+
else if (3 == u && 0 == l) g = n.readUnicode(r2, m, p / 2);
|
2739
|
+
else if (0 == l) g = n.readASCII(r2, m, p);
|
2740
|
+
else if (1 == l) g = n.readUnicode(r2, m, p / 2);
|
2741
|
+
else if (3 == l) g = n.readUnicode(r2, m, p / 2);
|
2862
2742
|
else {
|
2863
|
-
if (1 != u)
|
2864
|
-
throw "unknown encoding " + l + ", platformID: " + u;
|
2743
|
+
if (1 != u) throw "unknown encoding " + l + ", platformID: " + u;
|
2865
2744
|
g = n.readASCII(r2, m, p), console.debug("reading unknown MAC encoding " + l + " as ASCII");
|
2866
2745
|
}
|
2867
2746
|
var b = "p" + u + "," + v.toString(16);
|
2868
2747
|
null == o[b] && (o[b] = {}), o[b][void 0 !== S ? S : c] = g, o[b]._lang = v;
|
2869
2748
|
}
|
2870
|
-
for (var y in o)
|
2871
|
-
|
2872
|
-
|
2873
|
-
for (var y in o)
|
2874
|
-
if (null != o[y].postScriptName && 0 == o[y]._lang)
|
2875
|
-
return o[y];
|
2876
|
-
for (var y in o)
|
2877
|
-
if (null != o[y].postScriptName && 3084 == o[y]._lang)
|
2878
|
-
return o[y];
|
2879
|
-
for (var y in o)
|
2880
|
-
if (null != o[y].postScriptName)
|
2881
|
-
return o[y];
|
2749
|
+
for (var y in o) if (null != o[y].postScriptName && 1033 == o[y]._lang) return o[y];
|
2750
|
+
for (var y in o) if (null != o[y].postScriptName && 0 == o[y]._lang) return o[y];
|
2751
|
+
for (var y in o) if (null != o[y].postScriptName && 3084 == o[y]._lang) return o[y];
|
2752
|
+
for (var y in o) if (null != o[y].postScriptName) return o[y];
|
2882
2753
|
for (var y in o) {
|
2883
2754
|
i = y;
|
2884
2755
|
break;
|
@@ -2888,15 +2759,11 @@ function typrFactory() {
|
|
2888
2759
|
var n = e._bin.readUshort(r2, t2);
|
2889
2760
|
t2 += 2;
|
2890
2761
|
var o = {};
|
2891
|
-
if (0 == n)
|
2892
|
-
|
2893
|
-
else if (
|
2894
|
-
e["OS/2"].version1(r2, t2, o);
|
2895
|
-
else if (2 == n || 3 == n || 4 == n)
|
2896
|
-
e["OS/2"].version2(r2, t2, o);
|
2762
|
+
if (0 == n) e["OS/2"].version0(r2, t2, o);
|
2763
|
+
else if (1 == n) e["OS/2"].version1(r2, t2, o);
|
2764
|
+
else if (2 == n || 3 == n || 4 == n) e["OS/2"].version2(r2, t2, o);
|
2897
2765
|
else {
|
2898
|
-
if (5 != n)
|
2899
|
-
throw "unknown OS/2 table version: " + n;
|
2766
|
+
if (5 != n) throw "unknown OS/2 table version: " + n;
|
2900
2767
|
e["OS/2"].version5(r2, t2, o);
|
2901
2768
|
}
|
2902
2769
|
return o;
|
@@ -2917,30 +2784,23 @@ function typrFactory() {
|
|
2917
2784
|
return o.version = n.readFixed(r2, t2), t2 += 4, o.italicAngle = n.readFixed(r2, t2), t2 += 4, o.underlinePosition = n.readShort(r2, t2), t2 += 2, o.underlineThickness = n.readShort(r2, t2), t2 += 2, o;
|
2918
2785
|
}, null == e && (e = {}), null == e.U && (e.U = {}), e.U.codeToGlyph = function(r2, e2) {
|
2919
2786
|
var t2 = r2.cmap, a2 = -1;
|
2920
|
-
if (null != t2.p0e4 ? a2 = t2.p0e4 : null != t2.p3e1 ? a2 = t2.p3e1 : null != t2.p1e0 ? a2 = t2.p1e0 : null != t2.p0e3 && (a2 = t2.p0e3), -1 == a2)
|
2921
|
-
throw "no familiar platform and encoding!";
|
2787
|
+
if (null != t2.p0e4 ? a2 = t2.p0e4 : null != t2.p3e1 ? a2 = t2.p3e1 : null != t2.p1e0 ? a2 = t2.p1e0 : null != t2.p0e3 && (a2 = t2.p0e3), -1 == a2) throw "no familiar platform and encoding!";
|
2922
2788
|
var n = t2.tables[a2];
|
2923
|
-
if (0 == n.format)
|
2924
|
-
return e2 >= n.map.length ? 0 : n.map[e2];
|
2789
|
+
if (0 == n.format) return e2 >= n.map.length ? 0 : n.map[e2];
|
2925
2790
|
if (4 == n.format) {
|
2926
|
-
for (var o = -1, s = 0; s < n.endCount.length; s++)
|
2927
|
-
|
2928
|
-
|
2929
|
-
|
2930
|
-
|
2931
|
-
if (
|
2932
|
-
return 0;
|
2933
|
-
if (n.startCount[o] > e2)
|
2934
|
-
return 0;
|
2791
|
+
for (var o = -1, s = 0; s < n.endCount.length; s++) if (e2 <= n.endCount[s]) {
|
2792
|
+
o = s;
|
2793
|
+
break;
|
2794
|
+
}
|
2795
|
+
if (-1 == o) return 0;
|
2796
|
+
if (n.startCount[o] > e2) return 0;
|
2935
2797
|
return 65535 & (0 != n.idRangeOffset[o] ? n.glyphIdArray[e2 - n.startCount[o] + (n.idRangeOffset[o] >> 1) - (n.idRangeOffset.length - o)] : e2 + n.idDelta[o]);
|
2936
2798
|
}
|
2937
2799
|
if (12 == n.format) {
|
2938
|
-
if (e2 > n.groups[n.groups.length - 1][1])
|
2939
|
-
return 0;
|
2800
|
+
if (e2 > n.groups[n.groups.length - 1][1]) return 0;
|
2940
2801
|
for (s = 0; s < n.groups.length; s++) {
|
2941
2802
|
var i = n.groups[s];
|
2942
|
-
if (i[0] <= e2 && e2 <= i[1])
|
2943
|
-
return i[2] + (e2 - i[0]);
|
2803
|
+
if (i[0] <= e2 && e2 <= i[1]) return i[2] + (e2 - i[0]);
|
2944
2804
|
}
|
2945
2805
|
return 0;
|
2946
2806
|
}
|
@@ -2954,13 +2814,11 @@ function typrFactory() {
|
|
2954
2814
|
if (r2.CFF) {
|
2955
2815
|
var o = { x: 0, y: 0, stack: [], nStems: 0, haveWidth: false, width: r2.CFF.Private ? r2.CFF.Private.defaultWidthX : 0, open: false }, s = r2.CFF, i = r2.CFF.Private;
|
2956
2816
|
if (s.ROS) {
|
2957
|
-
for (var h = 0; s.FDSelect[h + 2] <= t2; )
|
2958
|
-
h += 2;
|
2817
|
+
for (var h = 0; s.FDSelect[h + 2] <= t2; ) h += 2;
|
2959
2818
|
i = s.FDArray[s.FDSelect[h + 1]].Private;
|
2960
2819
|
}
|
2961
2820
|
e.U._drawCFF(r2.CFF.CharStrings[t2], o, s, i, a2);
|
2962
|
-
} else
|
2963
|
-
r2.glyf && e.U._drawGlyf(t2, r2, a2);
|
2821
|
+
} else r2.glyf && e.U._drawGlyf(t2, r2, a2);
|
2964
2822
|
return a2;
|
2965
2823
|
}, e.U._drawGlyf = function(r2, t2, a2) {
|
2966
2824
|
var n = t2.glyf[r2];
|
@@ -2969,15 +2827,13 @@ function typrFactory() {
|
|
2969
2827
|
for (var a2 = 0; a2 < r2.noc; a2++) {
|
2970
2828
|
for (var n = 0 == a2 ? 0 : r2.endPts[a2 - 1] + 1, o = r2.endPts[a2], s = n; s <= o; s++) {
|
2971
2829
|
var i = s == n ? o : s - 1, h = s == o ? n : s + 1, d = 1 & r2.flags[s], f = 1 & r2.flags[i], u = 1 & r2.flags[h], l = r2.xs[s], v = r2.ys[s];
|
2972
|
-
if (s == n)
|
2973
|
-
if (
|
2974
|
-
|
2975
|
-
|
2976
|
-
|
2977
|
-
|
2978
|
-
|
2979
|
-
} else
|
2980
|
-
f ? e.U.P.moveTo(t2, r2.xs[i], r2.ys[i]) : e.U.P.moveTo(t2, (r2.xs[i] + l) / 2, (r2.ys[i] + v) / 2);
|
2830
|
+
if (s == n) if (d) {
|
2831
|
+
if (!f) {
|
2832
|
+
e.U.P.moveTo(t2, l, v);
|
2833
|
+
continue;
|
2834
|
+
}
|
2835
|
+
e.U.P.moveTo(t2, r2.xs[i], r2.ys[i]);
|
2836
|
+
} else f ? e.U.P.moveTo(t2, r2.xs[i], r2.ys[i]) : e.U.P.moveTo(t2, (r2.xs[i] + l) / 2, (r2.ys[i] + v) / 2);
|
2981
2837
|
d ? f && e.U.P.lineTo(t2, l, v) : u ? e.U.P.qcurveTo(t2, l, v, r2.xs[h], r2.ys[h]) : e.U.P.qcurveTo(t2, l, v, (l + r2.xs[h]) / 2, (v + r2.ys[h]) / 2);
|
2982
2838
|
}
|
2983
2839
|
e.U.P.closePath(t2);
|
@@ -2990,85 +2846,71 @@ function typrFactory() {
|
|
2990
2846
|
var d = o.crds[h], f = o.crds[h + 1];
|
2991
2847
|
a2.crds.push(d * i.a + f * i.b + i.tx), a2.crds.push(d * i.c + f * i.d + i.ty);
|
2992
2848
|
}
|
2993
|
-
for (h = 0; h < o.cmds.length; h++)
|
2994
|
-
a2.cmds.push(o.cmds[h]);
|
2849
|
+
for (h = 0; h < o.cmds.length; h++) a2.cmds.push(o.cmds[h]);
|
2995
2850
|
}
|
2996
2851
|
}, e.U._getGlyphClass = function(r2, t2) {
|
2997
2852
|
var a2 = e._lctf.getInterval(t2, r2);
|
2998
2853
|
return -1 == a2 ? 0 : t2[a2 + 2];
|
2999
2854
|
}, e.U._applySubs = function(r2, t2, a2, n) {
|
3000
|
-
for (var o = r2.length - t2 - 1, s = 0; s < a2.tabs.length; s++)
|
3001
|
-
|
3002
|
-
|
3003
|
-
if (
|
3004
|
-
|
3005
|
-
|
3006
|
-
|
3007
|
-
for (var
|
3008
|
-
|
3009
|
-
|
3010
|
-
for (var v = true, c = 0, p = 0; p < l; p++) {
|
3011
|
-
for (; -1 == r2[t2 + c + (1 + p)]; )
|
3012
|
-
c++;
|
3013
|
-
u.chain[p] != r2[t2 + c + (1 + p)] && (v = false);
|
3014
|
-
}
|
3015
|
-
if (v) {
|
3016
|
-
r2[t2] = u.nglyph;
|
3017
|
-
for (p = 0; p < l + c; p++)
|
3018
|
-
r2[t2 + p + 1] = -1;
|
3019
|
-
break;
|
3020
|
-
}
|
3021
|
-
}
|
2855
|
+
for (var o = r2.length - t2 - 1, s = 0; s < a2.tabs.length; s++) if (null != a2.tabs[s]) {
|
2856
|
+
var i, h = a2.tabs[s];
|
2857
|
+
if (!h.coverage || -1 != (i = e._lctf.coverageIndex(h.coverage, r2[t2]))) {
|
2858
|
+
if (1 == a2.ltype) r2[t2], 1 == h.fmt ? r2[t2] = r2[t2] + h.delta : r2[t2] = h.newg[i];
|
2859
|
+
else if (4 == a2.ltype) for (var d = h.vals[i], f = 0; f < d.length; f++) {
|
2860
|
+
var u = d[f], l = u.chain.length;
|
2861
|
+
if (!(l > o)) {
|
2862
|
+
for (var v = true, c = 0, p = 0; p < l; p++) {
|
2863
|
+
for (; -1 == r2[t2 + c + (1 + p)]; ) c++;
|
2864
|
+
u.chain[p] != r2[t2 + c + (1 + p)] && (v = false);
|
3022
2865
|
}
|
3023
|
-
|
3024
|
-
|
3025
|
-
|
3026
|
-
|
3027
|
-
|
3028
|
-
|
3029
|
-
|
3030
|
-
|
3031
|
-
|
3032
|
-
|
3033
|
-
|
3034
|
-
|
3035
|
-
|
3036
|
-
|
3037
|
-
|
3038
|
-
}
|
2866
|
+
if (v) {
|
2867
|
+
r2[t2] = u.nglyph;
|
2868
|
+
for (p = 0; p < l + c; p++) r2[t2 + p + 1] = -1;
|
2869
|
+
break;
|
2870
|
+
}
|
2871
|
+
}
|
2872
|
+
}
|
2873
|
+
else if (5 == a2.ltype && 2 == h.fmt) for (var U = e._lctf.getInterval(h.cDef, r2[t2]), g = h.cDef[U + 2], S = h.scset[g], m = 0; m < S.length; m++) {
|
2874
|
+
var b = S[m], y = b.input;
|
2875
|
+
if (!(y.length > o)) {
|
2876
|
+
for (v = true, p = 0; p < y.length; p++) {
|
2877
|
+
var F = e._lctf.getInterval(h.cDef, r2[t2 + 1 + p]);
|
2878
|
+
if (-1 == U && h.cDef[F + 2] != y[p]) {
|
2879
|
+
v = false;
|
2880
|
+
break;
|
3039
2881
|
}
|
3040
2882
|
}
|
3041
|
-
|
3042
|
-
|
3043
|
-
|
3044
|
-
if (!e.U._glsCovered(r2, h.inptCvg, t2))
|
3045
|
-
continue;
|
3046
|
-
if (!e.U._glsCovered(r2, h.ahedCvg, t2 + h.inptCvg.length))
|
3047
|
-
continue;
|
3048
|
-
var _ = h.lookupRec;
|
3049
|
-
for (m = 0; m < _.length; m += 2) {
|
3050
|
-
U = _[m];
|
3051
|
-
var P = n[_[m + 1]];
|
3052
|
-
e.U._applySubs(r2, t2 + U, P, n);
|
2883
|
+
if (v) {
|
2884
|
+
var C = b.substLookupRecords;
|
2885
|
+
for (f = 0; f < C.length; f += 2) C[f], C[f + 1];
|
3053
2886
|
}
|
3054
2887
|
}
|
3055
2888
|
}
|
2889
|
+
else if (6 == a2.ltype && 3 == h.fmt) {
|
2890
|
+
if (!e.U._glsCovered(r2, h.backCvg, t2 - h.backCvg.length)) continue;
|
2891
|
+
if (!e.U._glsCovered(r2, h.inptCvg, t2)) continue;
|
2892
|
+
if (!e.U._glsCovered(r2, h.ahedCvg, t2 + h.inptCvg.length)) continue;
|
2893
|
+
var _ = h.lookupRec;
|
2894
|
+
for (m = 0; m < _.length; m += 2) {
|
2895
|
+
U = _[m];
|
2896
|
+
var P = n[_[m + 1]];
|
2897
|
+
e.U._applySubs(r2, t2 + U, P, n);
|
2898
|
+
}
|
2899
|
+
}
|
3056
2900
|
}
|
2901
|
+
}
|
3057
2902
|
}, e.U._glsCovered = function(r2, t2, a2) {
|
3058
2903
|
for (var n = 0; n < t2.length; n++) {
|
3059
|
-
if (-1 == e._lctf.coverageIndex(t2[n], r2[a2 + n]))
|
3060
|
-
return false;
|
2904
|
+
if (-1 == e._lctf.coverageIndex(t2[n], r2[a2 + n])) return false;
|
3061
2905
|
}
|
3062
2906
|
return true;
|
3063
2907
|
}, e.U.glyphsToPath = function(r2, t2, a2) {
|
3064
2908
|
for (var n = { cmds: [], crds: [] }, o = 0, s = 0; s < t2.length; s++) {
|
3065
2909
|
var i = t2[s];
|
3066
2910
|
if (-1 != i) {
|
3067
|
-
for (var h = s < t2.length - 1 && -1 != t2[s + 1] ? t2[s + 1] : 0, d = e.U.glyphToPath(r2, i), f = 0; f < d.crds.length; f += 2)
|
3068
|
-
n.crds.push(d.crds[f] + o), n.crds.push(d.crds[f + 1]);
|
2911
|
+
for (var h = s < t2.length - 1 && -1 != t2[s + 1] ? t2[s + 1] : 0, d = e.U.glyphToPath(r2, i), f = 0; f < d.crds.length; f += 2) n.crds.push(d.crds[f] + o), n.crds.push(d.crds[f + 1]);
|
3069
2912
|
a2 && n.cmds.push(a2);
|
3070
|
-
for (f = 0; f < d.cmds.length; f++)
|
3071
|
-
n.cmds.push(d.cmds[f]);
|
2913
|
+
for (f = 0; f < d.cmds.length; f++) n.cmds.push(d.cmds[f]);
|
3072
2914
|
a2 && n.cmds.push("X"), o += r2.hmtx.aWidth[i], s < t2.length - 1 && (o += e.U.getPairAdjustment(r2, i, h));
|
3073
2915
|
}
|
3074
2916
|
}
|
@@ -3087,30 +2929,22 @@ function typrFactory() {
|
|
3087
2929
|
for (var s = t2.stack, i = t2.nStems, h = t2.haveWidth, d = t2.width, f = t2.open, u = 0, l = t2.x, v = t2.y, c = 0, p = 0, U = 0, g = 0, S = 0, m = 0, b = 0, y = 0, F = 0, C = 0, _ = { val: 0, size: 0 }; u < r2.length; ) {
|
3088
2930
|
e.CFF.getCharString(r2, u, _);
|
3089
2931
|
var P = _.val;
|
3090
|
-
if (u += _.size, "o1" == P || "o18" == P)
|
3091
|
-
s.length % 2 != 0 && !h && (d = s.shift() + n.nominalWidthX), i += s.length >> 1, s.length = 0, h = true;
|
2932
|
+
if (u += _.size, "o1" == P || "o18" == P) s.length % 2 != 0 && !h && (d = s.shift() + n.nominalWidthX), i += s.length >> 1, s.length = 0, h = true;
|
3092
2933
|
else if ("o3" == P || "o23" == P) {
|
3093
2934
|
s.length % 2 != 0 && !h && (d = s.shift() + n.nominalWidthX), i += s.length >> 1, s.length = 0, h = true;
|
3094
|
-
} else if ("o4" == P)
|
3095
|
-
|
3096
|
-
else if ("
|
3097
|
-
|
3098
|
-
|
3099
|
-
|
3100
|
-
for (var x = s.length, I = "o6" == P, w = 0; w < x; w++) {
|
3101
|
-
var k = s.shift();
|
3102
|
-
I ? l += k : v += k, I = !I, e.U.P.lineTo(o, l, v);
|
3103
|
-
}
|
2935
|
+
} else if ("o4" == P) s.length > 1 && !h && (d = s.shift() + n.nominalWidthX, h = true), f && e.U.P.closePath(o), v += s.pop(), e.U.P.moveTo(o, l, v), f = true;
|
2936
|
+
else if ("o5" == P) for (; s.length > 0; ) l += s.shift(), v += s.shift(), e.U.P.lineTo(o, l, v);
|
2937
|
+
else if ("o6" == P || "o7" == P) for (var x = s.length, I = "o6" == P, w = 0; w < x; w++) {
|
2938
|
+
var k = s.shift();
|
2939
|
+
I ? l += k : v += k, I = !I, e.U.P.lineTo(o, l, v);
|
2940
|
+
}
|
3104
2941
|
else if ("o8" == P || "o24" == P) {
|
3105
2942
|
x = s.length;
|
3106
|
-
for (var G = 0; G + 6 <= x; )
|
3107
|
-
c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), l = U + s.shift(), v = g + s.shift(), e.U.P.curveTo(o, c, p, U, g, l, v), G += 6;
|
2943
|
+
for (var G = 0; G + 6 <= x; ) c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), l = U + s.shift(), v = g + s.shift(), e.U.P.curveTo(o, c, p, U, g, l, v), G += 6;
|
3108
2944
|
"o24" == P && (l += s.shift(), v += s.shift(), e.U.P.lineTo(o, l, v));
|
3109
2945
|
} else {
|
3110
|
-
if ("o11" == P)
|
3111
|
-
|
3112
|
-
if ("o1234" == P || "o1235" == P || "o1236" == P || "o1237" == P)
|
3113
|
-
"o1234" == P && (p = v, U = (c = l + s.shift()) + s.shift(), C = g = p + s.shift(), m = g, y = v, l = (b = (S = (F = U + s.shift()) + s.shift()) + s.shift()) + s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v)), "o1235" == P && (c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), F = U + s.shift(), C = g + s.shift(), S = F + s.shift(), m = C + s.shift(), b = S + s.shift(), y = m + s.shift(), l = b + s.shift(), v = y + s.shift(), s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v)), "o1236" == P && (c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), C = g = p + s.shift(), m = g, b = (S = (F = U + s.shift()) + s.shift()) + s.shift(), y = m + s.shift(), l = b + s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v)), "o1237" == P && (c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), F = U + s.shift(), C = g + s.shift(), S = F + s.shift(), m = C + s.shift(), b = S + s.shift(), y = m + s.shift(), Math.abs(b - l) > Math.abs(y - v) ? l = b + s.shift() : v = y + s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v));
|
2946
|
+
if ("o11" == P) break;
|
2947
|
+
if ("o1234" == P || "o1235" == P || "o1236" == P || "o1237" == P) "o1234" == P && (p = v, U = (c = l + s.shift()) + s.shift(), C = g = p + s.shift(), m = g, y = v, l = (b = (S = (F = U + s.shift()) + s.shift()) + s.shift()) + s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v)), "o1235" == P && (c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), F = U + s.shift(), C = g + s.shift(), S = F + s.shift(), m = C + s.shift(), b = S + s.shift(), y = m + s.shift(), l = b + s.shift(), v = y + s.shift(), s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v)), "o1236" == P && (c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), C = g = p + s.shift(), m = g, b = (S = (F = U + s.shift()) + s.shift()) + s.shift(), y = m + s.shift(), l = b + s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v)), "o1237" == P && (c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), F = U + s.shift(), C = g + s.shift(), S = F + s.shift(), m = C + s.shift(), b = S + s.shift(), y = m + s.shift(), Math.abs(b - l) > Math.abs(y - v) ? l = b + s.shift() : v = y + s.shift(), e.U.P.curveTo(o, c, p, U, g, F, C), e.U.P.curveTo(o, S, m, b, y, l, v));
|
3114
2948
|
else if ("o14" == P) {
|
3115
2949
|
if (s.length > 0 && !h && (d = s.shift() + a2.nominalWidthX, h = true), 4 == s.length) {
|
3116
2950
|
var O = s.shift(), T = s.shift(), D = s.shift(), B = s.shift(), A = e.CFF.glyphBySE(a2, D), R = e.CFF.glyphBySE(a2, B);
|
@@ -3119,35 +2953,25 @@ function typrFactory() {
|
|
3119
2953
|
f && (e.U.P.closePath(o), f = false);
|
3120
2954
|
} else if ("o19" == P || "o20" == P) {
|
3121
2955
|
s.length % 2 != 0 && !h && (d = s.shift() + n.nominalWidthX), i += s.length >> 1, s.length = 0, h = true, u += i + 7 >> 3;
|
3122
|
-
} else if ("o21" == P)
|
3123
|
-
|
3124
|
-
else if ("o22" == P)
|
3125
|
-
s.length > 1 && !h && (d = s.shift() + n.nominalWidthX, h = true), l += s.pop(), f && e.U.P.closePath(o), e.U.P.moveTo(o, l, v), f = true;
|
2956
|
+
} else if ("o21" == P) s.length > 2 && !h && (d = s.shift() + n.nominalWidthX, h = true), v += s.pop(), l += s.pop(), f && e.U.P.closePath(o), e.U.P.moveTo(o, l, v), f = true;
|
2957
|
+
else if ("o22" == P) s.length > 1 && !h && (d = s.shift() + n.nominalWidthX, h = true), l += s.pop(), f && e.U.P.closePath(o), e.U.P.moveTo(o, l, v), f = true;
|
3126
2958
|
else if ("o25" == P) {
|
3127
|
-
for (; s.length > 6; )
|
3128
|
-
l += s.shift(), v += s.shift(), e.U.P.lineTo(o, l, v);
|
2959
|
+
for (; s.length > 6; ) l += s.shift(), v += s.shift(), e.U.P.lineTo(o, l, v);
|
3129
2960
|
c = l + s.shift(), p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), l = U + s.shift(), v = g + s.shift(), e.U.P.curveTo(o, c, p, U, g, l, v);
|
3130
|
-
} else if ("o26" == P)
|
3131
|
-
|
3132
|
-
c = l, p = v + s.shift(), l = U = c + s.shift(), v = (g = p + s.shift()) + s.shift(), e.U.P.curveTo(o, c, p, U, g, l, v);
|
3133
|
-
else if ("o27" == P)
|
3134
|
-
for (s.length % 2 && (v += s.shift()); s.length > 0; )
|
3135
|
-
p = v, U = (c = l + s.shift()) + s.shift(), g = p + s.shift(), l = U + s.shift(), v = g, e.U.P.curveTo(o, c, p, U, g, l, v);
|
2961
|
+
} else if ("o26" == P) for (s.length % 2 && (l += s.shift()); s.length > 0; ) c = l, p = v + s.shift(), l = U = c + s.shift(), v = (g = p + s.shift()) + s.shift(), e.U.P.curveTo(o, c, p, U, g, l, v);
|
2962
|
+
else if ("o27" == P) for (s.length % 2 && (v += s.shift()); s.length > 0; ) p = v, U = (c = l + s.shift()) + s.shift(), g = p + s.shift(), l = U + s.shift(), v = g, e.U.P.curveTo(o, c, p, U, g, l, v);
|
3136
2963
|
else if ("o10" == P || "o29" == P) {
|
3137
2964
|
var L = "o10" == P ? n : a2;
|
3138
|
-
if (0 == s.length)
|
3139
|
-
console.debug("error: empty stack");
|
2965
|
+
if (0 == s.length) console.debug("error: empty stack");
|
3140
2966
|
else {
|
3141
2967
|
var W = s.pop(), M = L.Subrs[W + L.Bias];
|
3142
2968
|
t2.x = l, t2.y = v, t2.nStems = i, t2.haveWidth = h, t2.width = d, t2.open = f, e.U._drawCFF(M, t2, a2, n, o), l = t2.x, v = t2.y, i = t2.nStems, h = t2.haveWidth, d = t2.width, f = t2.open;
|
3143
2969
|
}
|
3144
2970
|
} else if ("o30" == P || "o31" == P) {
|
3145
2971
|
var V = s.length, E = (G = 0, "o31" == P);
|
3146
|
-
for (G += V - (x = -3 & V); G < x; )
|
3147
|
-
E ? (p = v, U = (c = l + s.shift()) + s.shift(), v = (g = p + s.shift()) + s.shift(), x - G == 5 ? (l = U + s.shift(), G++) : l = U, E = false) : (c = l, p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), l = U + s.shift(), x - G == 5 ? (v = g + s.shift(), G++) : v = g, E = true), e.U.P.curveTo(o, c, p, U, g, l, v), G += 4;
|
2972
|
+
for (G += V - (x = -3 & V); G < x; ) E ? (p = v, U = (c = l + s.shift()) + s.shift(), v = (g = p + s.shift()) + s.shift(), x - G == 5 ? (l = U + s.shift(), G++) : l = U, E = false) : (c = l, p = v + s.shift(), U = c + s.shift(), g = p + s.shift(), l = U + s.shift(), x - G == 5 ? (v = g + s.shift(), G++) : v = g, E = true), e.U.P.curveTo(o, c, p, U, g, l, v), G += 4;
|
3148
2973
|
} else {
|
3149
|
-
if ("o" == (P + "").charAt(0))
|
3150
|
-
throw console.debug("Unknown operation: " + P, r2), P;
|
2974
|
+
if ("o" == (P + "").charAt(0)) throw console.debug("Unknown operation: " + P, r2), P;
|
3151
2975
|
s.push(P);
|
3152
2976
|
}
|
3153
2977
|
}
|
@@ -3168,12 +2992,9 @@ Original licenses apply:
|
|
3168
2992
|
function woff2otfFactory() {
|
3169
2993
|
return function(r) {
|
3170
2994
|
var e = Uint8Array, n = Uint16Array, t = Uint32Array, a = new e([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0, 0]), i = new e([0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 0, 0]), o = new e([16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15]), f = function(r2, e2) {
|
3171
|
-
for (var a2 = new n(31), i2 = 0; i2 < 31; ++i2)
|
3172
|
-
a2[i2] = e2 += 1 << r2[i2 - 1];
|
2995
|
+
for (var a2 = new n(31), i2 = 0; i2 < 31; ++i2) a2[i2] = e2 += 1 << r2[i2 - 1];
|
3173
2996
|
var o2 = new t(a2[30]);
|
3174
|
-
for (i2 = 1; i2 < 30; ++i2)
|
3175
|
-
for (var f2 = a2[i2]; f2 < a2[i2 + 1]; ++f2)
|
3176
|
-
o2[f2] = f2 - a2[i2] << 5 | i2;
|
2997
|
+
for (i2 = 1; i2 < 30; ++i2) for (var f2 = a2[i2]; f2 < a2[i2 + 1]; ++f2) o2[f2] = f2 - a2[i2] << 5 | i2;
|
3177
2998
|
return [a2, o2];
|
3178
2999
|
}, u = f(a, 2), v = u[0], s = u[1];
|
3179
3000
|
v[28] = 258, s[258] = 28;
|
@@ -3182,37 +3003,24 @@ function woff2otfFactory() {
|
|
3182
3003
|
h = (61680 & (h = (52428 & h) >>> 2 | (13107 & h) << 2)) >>> 4 | (3855 & h) << 4, c[g] = ((65280 & h) >>> 8 | (255 & h) << 8) >>> 1;
|
3183
3004
|
}
|
3184
3005
|
var w = function(r2, e2, t2) {
|
3185
|
-
for (var a2 = r2.length, i2 = 0, o2 = new n(e2); i2 < a2; ++i2)
|
3186
|
-
++o2[r2[i2] - 1];
|
3006
|
+
for (var a2 = r2.length, i2 = 0, o2 = new n(e2); i2 < a2; ++i2) ++o2[r2[i2] - 1];
|
3187
3007
|
var f2, u2 = new n(e2);
|
3188
|
-
for (i2 = 0; i2 < e2; ++i2)
|
3189
|
-
|
3190
|
-
if (t2) {
|
3008
|
+
for (i2 = 0; i2 < e2; ++i2) u2[i2] = u2[i2 - 1] + o2[i2 - 1] << 1;
|
3009
|
+
{
|
3191
3010
|
f2 = new n(1 << e2);
|
3192
3011
|
var v2 = 15 - e2;
|
3193
|
-
for (i2 = 0; i2 < a2; ++i2)
|
3194
|
-
|
3195
|
-
for (var s2 = i2 << 4 | r2[i2], l2 = e2 - r2[i2], g2 = u2[r2[i2] - 1]++ << l2, h2 = g2 | (1 << l2) - 1; g2 <= h2; ++g2)
|
3196
|
-
f2[c[g2] >>> v2] = s2;
|
3197
|
-
} else
|
3198
|
-
for (f2 = new n(a2), i2 = 0; i2 < a2; ++i2)
|
3199
|
-
r2[i2] && (f2[i2] = c[u2[r2[i2] - 1]++] >>> 15 - r2[i2]);
|
3012
|
+
for (i2 = 0; i2 < a2; ++i2) if (r2[i2]) for (var s2 = i2 << 4 | r2[i2], l2 = e2 - r2[i2], g2 = u2[r2[i2] - 1]++ << l2, h2 = g2 | (1 << l2) - 1; g2 <= h2; ++g2) f2[c[g2] >>> v2] = s2;
|
3013
|
+
}
|
3200
3014
|
return f2;
|
3201
3015
|
}, d = new e(288);
|
3202
|
-
for (g = 0; g < 144; ++g)
|
3203
|
-
|
3204
|
-
for (g =
|
3205
|
-
|
3206
|
-
for (g = 256; g < 280; ++g)
|
3207
|
-
d[g] = 7;
|
3208
|
-
for (g = 280; g < 288; ++g)
|
3209
|
-
d[g] = 8;
|
3016
|
+
for (g = 0; g < 144; ++g) d[g] = 8;
|
3017
|
+
for (g = 144; g < 256; ++g) d[g] = 9;
|
3018
|
+
for (g = 256; g < 280; ++g) d[g] = 7;
|
3019
|
+
for (g = 280; g < 288; ++g) d[g] = 8;
|
3210
3020
|
var m = new e(32);
|
3211
|
-
for (g = 0; g < 32; ++g)
|
3212
|
-
|
3213
|
-
|
3214
|
-
for (var e2 = r2[0], n2 = 1; n2 < r2.length; ++n2)
|
3215
|
-
r2[n2] > e2 && (e2 = r2[n2]);
|
3021
|
+
for (g = 0; g < 32; ++g) m[g] = 5;
|
3022
|
+
var b = w(d, 9), p = w(m, 5), y = function(r2) {
|
3023
|
+
for (var e2 = r2[0], n2 = 1; n2 < r2.length; ++n2) r2[n2] > e2 && (e2 = r2[n2]);
|
3216
3024
|
return e2;
|
3217
3025
|
}, L = function(r2, e2, n2) {
|
3218
3026
|
var t2 = e2 / 8 | 0;
|
@@ -3222,13 +3030,11 @@ function woff2otfFactory() {
|
|
3222
3030
|
return (r2[n2] | r2[n2 + 1] << 8 | r2[n2 + 2] << 16) >> (7 & e2);
|
3223
3031
|
}, k = ["unexpected EOF", "invalid block type", "invalid length/literal", "invalid distance", "stream finished", "no stream handler", , "no callback", "invalid UTF-8 data", "extra field too long", "date not in range 1980-2099", "filename too long", "stream finishing", "invalid zip data"], T = function(r2, e2, n2) {
|
3224
3032
|
var t2 = new Error(e2 || k[r2]);
|
3225
|
-
if (t2.code = r2, Error.captureStackTrace && Error.captureStackTrace(t2, T), !n2)
|
3226
|
-
throw t2;
|
3033
|
+
if (t2.code = r2, Error.captureStackTrace && Error.captureStackTrace(t2, T), !n2) throw t2;
|
3227
3034
|
return t2;
|
3228
3035
|
}, O = function(r2, f2, u2) {
|
3229
3036
|
var s2 = r2.length;
|
3230
|
-
if (!s2 || u2 && !u2.l && s2 < 5)
|
3231
|
-
return f2 || new e(0);
|
3037
|
+
if (!s2 || u2 && !u2.l && s2 < 5) return f2 || new e(0);
|
3232
3038
|
var c2 = !f2 || u2, g2 = !u2 || u2.i;
|
3233
3039
|
u2 || (u2 = {}), f2 || (f2 = new e(3 * s2));
|
3234
3040
|
var h2, d2 = function(r3) {
|
@@ -3251,29 +3057,24 @@ function woff2otfFactory() {
|
|
3251
3057
|
c2 && d2(O2 + V), f2.set(r2.subarray(I, _), O2), u2.b = O2 += V, u2.p = k2 = 8 * _;
|
3252
3058
|
continue;
|
3253
3059
|
}
|
3254
|
-
if (1 == S)
|
3255
|
-
A2 = b, x2 = p, E = 9, D = 5;
|
3060
|
+
if (1 == S) A2 = b, x2 = p, E = 9, D = 5;
|
3256
3061
|
else if (2 == S) {
|
3257
3062
|
var j = L(r2, k2, 31) + 257, z = L(r2, k2 + 10, 15) + 4, C = j + L(r2, k2 + 5, 31) + 1;
|
3258
3063
|
k2 += 14;
|
3259
|
-
for (var F = new e(C), P = new e(19), q = 0; q < z; ++q)
|
3260
|
-
P[o[q]] = L(r2, k2 + 3 * q, 7);
|
3064
|
+
for (var F = new e(C), P = new e(19), q = 0; q < z; ++q) P[o[q]] = L(r2, k2 + 3 * q, 7);
|
3261
3065
|
k2 += 3 * z;
|
3262
|
-
var B = y(P), G = (1 << B) - 1, H = w(P, B
|
3066
|
+
var B = y(P), G = (1 << B) - 1, H = w(P, B);
|
3263
3067
|
for (q = 0; q < C; ) {
|
3264
3068
|
var I, J = H[L(r2, k2, G)];
|
3265
|
-
if (k2 += 15 & J, (I = J >>> 4) < 16)
|
3266
|
-
F[q++] = I;
|
3069
|
+
if (k2 += 15 & J, (I = J >>> 4) < 16) F[q++] = I;
|
3267
3070
|
else {
|
3268
3071
|
var K = 0, N = 0;
|
3269
|
-
for (16 == I ? (N = 3 + L(r2, k2, 3), k2 += 2, K = F[q - 1]) : 17 == I ? (N = 3 + L(r2, k2, 7), k2 += 3) : 18 == I && (N = 11 + L(r2, k2, 127), k2 += 7); N--; )
|
3270
|
-
F[q++] = K;
|
3072
|
+
for (16 == I ? (N = 3 + L(r2, k2, 3), k2 += 2, K = F[q - 1]) : 17 == I ? (N = 3 + L(r2, k2, 7), k2 += 3) : 18 == I && (N = 11 + L(r2, k2, 127), k2 += 7); N--; ) F[q++] = K;
|
3271
3073
|
}
|
3272
3074
|
}
|
3273
3075
|
var Q = F.subarray(0, j), R = F.subarray(j);
|
3274
|
-
E = y(Q), D = y(R), A2 = w(Q, E
|
3275
|
-
} else
|
3276
|
-
T(1);
|
3076
|
+
E = y(Q), D = y(R), A2 = w(Q, E), x2 = w(R, D);
|
3077
|
+
} else T(1);
|
3277
3078
|
if (k2 > M) {
|
3278
3079
|
g2 && T(0);
|
3279
3080
|
break;
|
@@ -3286,8 +3087,7 @@ function woff2otfFactory() {
|
|
3286
3087
|
g2 && T(0);
|
3287
3088
|
break;
|
3288
3089
|
}
|
3289
|
-
if (K || T(2), Z < 256)
|
3290
|
-
f2[O2++] = Z;
|
3090
|
+
if (K || T(2), Z < 256) f2[O2++] = Z;
|
3291
3091
|
else {
|
3292
3092
|
if (256 == Z) {
|
3293
3093
|
Y = k2, A2 = null;
|
@@ -3310,15 +3110,14 @@ function woff2otfFactory() {
|
|
3310
3110
|
break;
|
3311
3111
|
}
|
3312
3112
|
c2 && d2(O2 + 131072);
|
3313
|
-
for (var tr = O2 + $; O2 < tr; O2 += 4)
|
3314
|
-
f2[O2] = f2[O2 - R], f2[O2 + 1] = f2[O2 + 1 - R], f2[O2 + 2] = f2[O2 + 2 - R], f2[O2 + 3] = f2[O2 + 3 - R];
|
3113
|
+
for (var tr = O2 + $; O2 < tr; O2 += 4) f2[O2] = f2[O2 - R], f2[O2 + 1] = f2[O2 + 1 - R], f2[O2 + 2] = f2[O2 + 2 - R], f2[O2 + 3] = f2[O2 + 3 - R];
|
3315
3114
|
O2 = tr;
|
3316
3115
|
}
|
3317
3116
|
}
|
3318
3117
|
u2.l = A2, u2.p = Y, u2.b = O2, A2 && (m2 = 1, u2.m = E, u2.d = x2, u2.n = D);
|
3319
3118
|
} while (!m2);
|
3320
3119
|
return O2 == f2.length ? f2 : function(r3, a2, i2) {
|
3321
|
-
(null ==
|
3120
|
+
(null == i2 || i2 > r3.length) && (i2 = r3.length);
|
3322
3121
|
var o2 = new (r3 instanceof n ? n : r3 instanceof t ? t : e)(i2 - a2);
|
3323
3122
|
return o2.set(r3.subarray(a2, i2)), o2;
|
3324
3123
|
}(f2, 0, O2);
|
@@ -3344,11 +3143,9 @@ function woff2otfFactory() {
|
|
3344
3143
|
function o2(r3) {
|
3345
3144
|
m2.setUint32(b2, r3), b2 += 4;
|
3346
3145
|
}
|
3347
|
-
for (var f2 = { signature: a2(), flavor: a2(), length: a2(), numTables: t2(), reserved: t2(), totalSfntSize: a2(), majorVersion: t2(), minorVersion: t2(), metaOffset: a2(), metaLength: a2(), metaOrigLength: a2(), privOffset: a2(), privLength: a2() }, u2 = 0; Math.pow(2, u2) <= f2.numTables; )
|
3348
|
-
u2++;
|
3146
|
+
for (var f2 = { signature: a2(), flavor: a2(), length: a2(), numTables: t2(), reserved: t2(), totalSfntSize: a2(), majorVersion: t2(), minorVersion: t2(), metaOffset: a2(), metaLength: a2(), metaOrigLength: a2(), privOffset: a2(), privLength: a2() }, u2 = 0; Math.pow(2, u2) <= f2.numTables; ) u2++;
|
3349
3147
|
u2--;
|
3350
|
-
for (var v2 = 16 * Math.pow(2, u2), s2 = 16 * f2.numTables - v2, l2 = 12, c2 = [], g2 = 0; g2 < f2.numTables; g2++)
|
3351
|
-
c2.push({ tag: a2(), offset: a2(), compLength: a2(), origLength: a2(), origChecksum: a2() }), l2 += 16;
|
3148
|
+
for (var v2 = 16 * Math.pow(2, u2), s2 = 16 * f2.numTables - v2, l2 = 12, c2 = [], g2 = 0; g2 < f2.numTables; g2++) c2.push({ tag: a2(), offset: a2(), compLength: a2(), origLength: a2(), origChecksum: a2() }), l2 += 16;
|
3352
3149
|
var h2, w2 = new Uint8Array(12 + 16 * c2.length + c2.reduce(function(r3, e3) {
|
3353
3150
|
return r3 + e3.origLength + 4;
|
3354
3151
|
}, 0)), d2 = w2.buffer, m2 = new DataView(d2), b2 = 0;
|
@@ -3359,8 +3156,7 @@ function woff2otfFactory() {
|
|
3359
3156
|
if (e3.compLength != e3.origLength) {
|
3360
3157
|
var a3 = new Uint8Array(e3.origLength);
|
3361
3158
|
n3 = new Uint8Array(t3, 2), O(n3, a3);
|
3362
|
-
} else
|
3363
|
-
a3 = new Uint8Array(t3);
|
3159
|
+
} else a3 = new Uint8Array(t3);
|
3364
3160
|
w2.set(a3, e3.outOffset);
|
3365
3161
|
var i3 = 0;
|
3366
3162
|
(l2 = e3.outOffset + e3.origLength) % 4 != 0 && (i3 = 4 - l2 % 4), w2.set(new Uint8Array(i3).buffer, e3.outOffset + e3.origLength), h2 = l2 + i3;
|
@@ -3438,8 +3234,7 @@ function parserFactory(Typr, woff2otf) {
|
|
3438
3234
|
prevForm = joiningForms[i] = form;
|
3439
3235
|
prevJoiningType = joiningType;
|
3440
3236
|
prevIndex = i;
|
3441
|
-
if (code > 65535)
|
3442
|
-
i++;
|
3237
|
+
if (code > 65535) i++;
|
3443
3238
|
}
|
3444
3239
|
return joiningForms;
|
3445
3240
|
}
|
@@ -3447,8 +3242,7 @@ function parserFactory(Typr, woff2otf) {
|
|
3447
3242
|
const glyphIds = [];
|
3448
3243
|
for (let i = 0; i < str.length; i++) {
|
3449
3244
|
const cc = str.codePointAt(i);
|
3450
|
-
if (cc > 65535)
|
3451
|
-
i++;
|
3245
|
+
if (cc > 65535) i++;
|
3452
3246
|
glyphIds.push(Typr.U.codeToGlyph(font, cc));
|
3453
3247
|
}
|
3454
3248
|
const gsub = font["GSUB"];
|
@@ -3460,8 +3254,7 @@ function parserFactory(Typr, woff2otf) {
|
|
3460
3254
|
featureList.forEach((feature) => {
|
3461
3255
|
if (supportedFeatures.test(feature.tag)) {
|
3462
3256
|
for (let ti = 0; ti < feature.tab.length; ti++) {
|
3463
|
-
if (usedLookups[feature.tab[ti]])
|
3464
|
-
continue;
|
3257
|
+
if (usedLookups[feature.tab[ti]]) continue;
|
3465
3258
|
usedLookups[feature.tab[ti]] = true;
|
3466
3259
|
const tab = lookupList[feature.tab[ti]];
|
3467
3260
|
const isJoiningFeature = /^(isol|init|fina|medi)$/.test(feature.tag);
|
@@ -3484,8 +3277,7 @@ function parserFactory(Typr, woff2otf) {
|
|
3484
3277
|
let glyphIndex = 0;
|
3485
3278
|
for (; glyphIndex < glyphIds.length; glyphIndex++) {
|
3486
3279
|
const glyphId = glyphIds[glyphIndex];
|
3487
|
-
if (glyphId === -1)
|
3488
|
-
continue;
|
3280
|
+
if (glyphId === -1) continue;
|
3489
3281
|
positions[glyphIndex * 3 + 2] = font.hmtx.aWidth[glyphId];
|
3490
3282
|
const gpos = font.GPOS;
|
3491
3283
|
if (gpos) {
|
@@ -3509,8 +3301,7 @@ function parserFactory(Typr, woff2otf) {
|
|
3509
3301
|
if (tab.fmt === 1) {
|
3510
3302
|
const right = tab.pairsets[coverageIndex];
|
3511
3303
|
for (let k = 0; k < right.length; k++) {
|
3512
|
-
if (right[k].gid2 === glyphId)
|
3513
|
-
adj = right[k];
|
3304
|
+
if (right[k].gid2 === glyphId) adj = right[k];
|
3514
3305
|
}
|
3515
3306
|
} else if (tab.fmt === 2) {
|
3516
3307
|
const c1 = Typr.U._getGlyphClass(glyphIds[prevGlyphIndex], tab.classDef1);
|
@@ -3518,10 +3309,8 @@ function parserFactory(Typr, woff2otf) {
|
|
3518
3309
|
adj = tab.matrix[c1][c2];
|
3519
3310
|
}
|
3520
3311
|
if (adj) {
|
3521
|
-
if (adj.val1)
|
3522
|
-
|
3523
|
-
if (adj.val2)
|
3524
|
-
applyValueRecord(adj.val2, glyphIndex);
|
3312
|
+
if (adj.val1) applyValueRecord(adj.val1, prevGlyphIndex);
|
3313
|
+
if (adj.val2) applyValueRecord(adj.val2, glyphIndex);
|
3525
3314
|
break;
|
3526
3315
|
}
|
3527
3316
|
}
|
@@ -3645,14 +3434,10 @@ function parserFactory(Typr, woff2otf) {
|
|
3645
3434
|
for (let i2 = 0, len = crds.length; i2 < len; i2 += 2) {
|
3646
3435
|
let x = crds[i2];
|
3647
3436
|
let y = crds[i2 + 1];
|
3648
|
-
if (x < xMin)
|
3649
|
-
|
3650
|
-
if (
|
3651
|
-
|
3652
|
-
if (x > xMax)
|
3653
|
-
xMax = x;
|
3654
|
-
if (y > yMax)
|
3655
|
-
yMax = y;
|
3437
|
+
if (x < xMin) xMin = x;
|
3438
|
+
if (y < yMin) yMin = y;
|
3439
|
+
if (x > xMax) xMax = x;
|
3440
|
+
if (y > yMax) yMax = y;
|
3656
3441
|
}
|
3657
3442
|
} else {
|
3658
3443
|
xMin = xMax = yMin = yMax = 0;
|
@@ -3760,8 +3545,7 @@ function unicodeFontResolverClientFactory() {
|
|
3760
3545
|
}
|
3761
3546
|
function c(t2, n2) {
|
3762
3547
|
u(t2, function(t3, r2) {
|
3763
|
-
for (var e2 = t3; e2 <= r2; e2++)
|
3764
|
-
n2(e2);
|
3548
|
+
for (var e2 = t3; e2 <= r2; e2++) n2(e2);
|
3765
3549
|
});
|
3766
3550
|
}
|
3767
3551
|
var s = {}, f = {}, l = /* @__PURE__ */ new WeakMap(), v = "https://cdn.jsdelivr.net/gh/lojjic/unicode-font-resolver@v1.0.1/packages/data";
|
@@ -3774,16 +3558,14 @@ function unicodeFontResolverClientFactory() {
|
|
3774
3558
|
var h, p = /* @__PURE__ */ new Map();
|
3775
3559
|
function g(t2, n2, r2) {
|
3776
3560
|
return t2[n2] ? n2 : t2[r2] ? r2 : function(t3) {
|
3777
|
-
for (var n3 in t3)
|
3778
|
-
return n3;
|
3561
|
+
for (var n3 in t3) return n3;
|
3779
3562
|
}(t2);
|
3780
3563
|
}
|
3781
3564
|
function w(t2, n2) {
|
3782
3565
|
var r2 = n2;
|
3783
3566
|
if (!t2.includes(r2)) {
|
3784
3567
|
r2 = 1 / 0;
|
3785
|
-
for (var e2 = 0; e2 < t2.length; e2++)
|
3786
|
-
Math.abs(t2[e2] - n2) < Math.abs(r2 - n2) && (r2 = t2[e2]);
|
3568
|
+
for (var e2 = 0; e2 < t2.length; e2++) Math.abs(t2[e2] - n2) < Math.abs(r2 - n2) && (r2 = t2[e2]);
|
3787
3569
|
}
|
3788
3570
|
return r2;
|
3789
3571
|
}
|
@@ -3797,7 +3579,7 @@ function unicodeFontResolverClientFactory() {
|
|
3797
3579
|
}, t.getFontsForString = function(t2, n2) {
|
3798
3580
|
void 0 === n2 && (n2 = {});
|
3799
3581
|
var r2, e2 = n2.lang;
|
3800
|
-
void 0 === e2 && (e2 =
|
3582
|
+
void 0 === e2 && (e2 = new RegExp("\\p{Script=Hangul}", "u").test(r2 = t2) ? "ko" : new RegExp("\\p{Script=Hiragana}|\\p{Script=Katakana}", "u").test(r2) ? "ja" : "en");
|
3801
3583
|
var o2 = n2.category;
|
3802
3584
|
void 0 === o2 && (o2 = "sans-serif");
|
3803
3585
|
var u2 = n2.style;
|
@@ -3808,16 +3590,13 @@ function unicodeFontResolverClientFactory() {
|
|
3808
3590
|
function M(t3) {
|
3809
3591
|
var n3 = p.get(t3);
|
3810
3592
|
return n3 || (n3 = fetch(l2 + "/" + t3).then(function(t4) {
|
3811
|
-
if (!t4.ok)
|
3812
|
-
throw new Error(t4.statusText);
|
3593
|
+
if (!t4.ok) throw new Error(t4.statusText);
|
3813
3594
|
return t4.json().then(function(t5) {
|
3814
|
-
if (!Array.isArray(t5) || 1 !== t5[0])
|
3815
|
-
throw new Error("Incorrect schema version; need 1, got " + t5[0]);
|
3595
|
+
if (!Array.isArray(t5) || 1 !== t5[0]) throw new Error("Incorrect schema version; need 1, got " + t5[0]);
|
3816
3596
|
return t5[1];
|
3817
3597
|
});
|
3818
3598
|
}).catch(function(n4) {
|
3819
|
-
if (l2 !== v)
|
3820
|
-
return j || (console.error('unicode-font-resolver: Failed loading from dataUrl "' + l2 + '", trying default CDN. ' + n4.message), j = true), l2 = v, p.delete(t3), M(t3);
|
3599
|
+
if (l2 !== v) return j || (console.error('unicode-font-resolver: Failed loading from dataUrl "' + l2 + '", trying default CDN. ' + n4.message), j = true), l2 = v, p.delete(t3), M(t3);
|
3821
3600
|
throw n4;
|
3822
3601
|
}), p.set(t3, n3)), n3;
|
3823
3602
|
}
|
@@ -3826,8 +3605,7 @@ function unicodeFontResolverClientFactory() {
|
|
3826
3605
|
A[n3] = e3, s[e3] || S.has(e3) || S.set(e3, M(e3).then(function(t3) {
|
3827
3606
|
s[e3] = t3;
|
3828
3607
|
})), r3 > 65535 && (n3++, E = n3);
|
3829
|
-
}, E = 0; E < t2.length; E++)
|
3830
|
-
P(E);
|
3608
|
+
}, E = 0; E < t2.length; E++) P(E);
|
3831
3609
|
return Promise.all(S.values()).then(function() {
|
3832
3610
|
S.clear();
|
3833
3611
|
for (var n3 = function(n4) {
|
@@ -3835,36 +3613,30 @@ function unicodeFontResolverClientFactory() {
|
|
3835
3613
|
for (var l3 in u3) {
|
3836
3614
|
var v2 = m[l3];
|
3837
3615
|
if (void 0 === v2 && (v2 = m[l3] = new RegExp(l3).test(e2 || "en")), v2) {
|
3838
|
-
for (var d2 in c3 = l3, u3[l3])
|
3839
|
-
|
3840
|
-
|
3841
|
-
|
3842
|
-
}
|
3616
|
+
for (var d2 in c3 = l3, u3[l3]) if (i(o3, u3[l3][d2])) {
|
3617
|
+
a2 = d2;
|
3618
|
+
break;
|
3619
|
+
}
|
3843
3620
|
break;
|
3844
3621
|
}
|
3845
3622
|
}
|
3846
3623
|
if (!a2) {
|
3847
|
-
t:
|
3848
|
-
for (var
|
3849
|
-
|
3850
|
-
|
3851
|
-
|
3852
|
-
|
3853
|
-
break t;
|
3854
|
-
}
|
3855
|
-
}
|
3624
|
+
t: for (var h3 in u3) if (h3 !== c3) {
|
3625
|
+
for (var p2 in u3[h3]) if (i(o3, u3[h3][p2])) {
|
3626
|
+
a2 = p2;
|
3627
|
+
break t;
|
3628
|
+
}
|
3629
|
+
}
|
3856
3630
|
}
|
3857
3631
|
a2 || (console.debug("No font coverage for U+" + o3.toString(16)), a2 = "latin"), A[n4] = a2, f[a2] || S.has(a2) || S.set(a2, M("font-meta/" + a2 + ".json").then(function(t3) {
|
3858
3632
|
f[a2] = t3;
|
3859
3633
|
})), o3 > 65535 && (n4++, r3 = n4);
|
3860
|
-
}, r3 = 0; r3 < t2.length; r3++)
|
3861
|
-
n3(r3);
|
3634
|
+
}, r3 = 0; r3 < t2.length; r3++) n3(r3);
|
3862
3635
|
return Promise.all(S.values());
|
3863
3636
|
}).then(function() {
|
3864
3637
|
for (var n3, r3 = null, e3 = 0; e3 < t2.length; e3++) {
|
3865
3638
|
var a2 = t2.codePointAt(e3);
|
3866
|
-
if (r3 && (k(a2) || d(r3).has(a2)))
|
3867
|
-
y[e3] = y[e3 - 1];
|
3639
|
+
if (r3 && (k(a2) || d(r3).has(a2))) y[e3] = y[e3 - 1];
|
3868
3640
|
else {
|
3869
3641
|
r3 = f[A[e3]];
|
3870
3642
|
var i2 = b[r3.id];
|
@@ -3942,8 +3714,7 @@ function createFontResolver(fontParser, unicodeFontResolverClient) {
|
|
3942
3714
|
}
|
3943
3715
|
const fontIndices = /* @__PURE__ */ new Map();
|
3944
3716
|
const fallbackRanges = [];
|
3945
|
-
if (style !== "italic")
|
3946
|
-
style = "normal";
|
3717
|
+
if (style !== "italic") style = "normal";
|
3947
3718
|
if (typeof weight !== "number") {
|
3948
3719
|
weight = weight === "bold" ? 700 : 400;
|
3949
3720
|
}
|
@@ -4268,8 +4039,7 @@ function createTypesetter(resolveFonts, bidi) {
|
|
4268
4039
|
isTrailingWhitespace = false;
|
4269
4040
|
}
|
4270
4041
|
let { lineHeight: lineHeight2, capHeight, xHeight, baseline } = glyphInfo.fontData;
|
4271
|
-
if (lineHeight2 > line.lineHeight)
|
4272
|
-
line.lineHeight = lineHeight2;
|
4042
|
+
if (lineHeight2 > line.lineHeight) line.lineHeight = lineHeight2;
|
4273
4043
|
const baselineDiff = baseline - line.baseline;
|
4274
4044
|
if (baselineDiff < 0) {
|
4275
4045
|
line.baseline += baselineDiff;
|
@@ -4437,28 +4207,20 @@ function createTypesetter(resolveFonts, bidi) {
|
|
4437
4207
|
const visY0 = glyphY + glyphObj.yMin * fontSizeMult;
|
4438
4208
|
const visX1 = glyphX + glyphObj.xMax * fontSizeMult;
|
4439
4209
|
const visY1 = glyphY + glyphObj.yMax * fontSizeMult;
|
4440
|
-
if (visX0 < visibleBounds[0])
|
4441
|
-
|
4442
|
-
if (
|
4443
|
-
|
4444
|
-
if (visX1 > visibleBounds[2])
|
4445
|
-
visibleBounds[2] = visX1;
|
4446
|
-
if (visY1 > visibleBounds[3])
|
4447
|
-
visibleBounds[3] = visY1;
|
4210
|
+
if (visX0 < visibleBounds[0]) visibleBounds[0] = visX0;
|
4211
|
+
if (visY0 < visibleBounds[1]) visibleBounds[1] = visY0;
|
4212
|
+
if (visX1 > visibleBounds[2]) visibleBounds[2] = visX1;
|
4213
|
+
if (visY1 > visibleBounds[3]) visibleBounds[3] = visY1;
|
4448
4214
|
if (idx % chunkedBoundsSize === 0) {
|
4449
4215
|
chunk = { start: idx, end: idx, rect: [INF, INF, -INF, -INF] };
|
4450
4216
|
chunkedBounds.push(chunk);
|
4451
4217
|
}
|
4452
4218
|
chunk.end++;
|
4453
4219
|
const chunkRect = chunk.rect;
|
4454
|
-
if (visX0 < chunkRect[0])
|
4455
|
-
|
4456
|
-
if (
|
4457
|
-
|
4458
|
-
if (visX1 > chunkRect[2])
|
4459
|
-
chunkRect[2] = visX1;
|
4460
|
-
if (visY1 > chunkRect[3])
|
4461
|
-
chunkRect[3] = visY1;
|
4220
|
+
if (visX0 < chunkRect[0]) chunkRect[0] = visX0;
|
4221
|
+
if (visY0 < chunkRect[1]) chunkRect[1] = visY0;
|
4222
|
+
if (visX1 > chunkRect[2]) chunkRect[2] = visX1;
|
4223
|
+
if (visY1 > chunkRect[3]) chunkRect[3] = visY1;
|
4462
4224
|
glyphIds[idx] = glyphId;
|
4463
4225
|
glyphFontIndices[idx] = fontIndex;
|
4464
4226
|
if (colorRanges) {
|
@@ -5672,8 +5434,7 @@ class Text extends Mesh {
|
|
5672
5434
|
strokeColor = this.strokeColor;
|
5673
5435
|
uniforms.uTroikaStrokeColor.value.set(strokeColor == null ? defaultStrokeColor : strokeColor);
|
5674
5436
|
strokeOpacity = this.strokeOpacity;
|
5675
|
-
if (strokeOpacity == null)
|
5676
|
-
strokeOpacity = 1;
|
5437
|
+
if (strokeOpacity == null) strokeOpacity = 1;
|
5677
5438
|
}
|
5678
5439
|
fillOpacity = this.fillOpacity;
|
5679
5440
|
}
|
@@ -5891,10 +5652,8 @@ function groupCaretsByRow(textRenderInfo) {
|
|
5891
5652
|
if (!curRow || top < (curRow.top + curRow.bottom) / 2) {
|
5892
5653
|
rows.push(curRow = { bottom, top, carets: [] });
|
5893
5654
|
}
|
5894
|
-
if (top > curRow.top)
|
5895
|
-
|
5896
|
-
if (bottom < curRow.bottom)
|
5897
|
-
curRow.bottom = bottom;
|
5655
|
+
if (top > curRow.top) curRow.top = top;
|
5656
|
+
if (bottom < curRow.bottom) curRow.bottom = bottom;
|
5898
5657
|
curRow.carets.push({
|
5899
5658
|
x,
|
5900
5659
|
y: bottom,
|