@vitessce/dev 3.5.12 → 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-039d2f27.js → blosc-BGDKghio.js} +2 -5
- package/dist/{browser-122c4c35.js → browser-CwsEWr7C.js} +4 -6
- package/dist/{deflate-b57ef85f.js → deflate-BCuo9WU9.js} +2 -4
- package/dist/{gzip-6a24f0fe.js → gzip-BcpOCWcu.js} +2 -5
- package/dist/{higlass-bd3bb438.js → higlass-m_n_jkWF.js} +1486 -1953
- package/dist/{index-f9b7fcdb.js → index-BauUKP4s.js} +14017 -14279
- package/dist/{index-4f10e6bc.js → index-DQ1XVscb.js} +237740 -207382
- package/dist/{index-fed4c7c6.js → index-UB-I7aLr.js} +6715 -6891
- package/dist/index.js +35 -36
- package/dist/{jpeg-2c38fd60.js → jpeg-DGhwYOZJ.js} +20 -3
- package/dist/lerc-DWIwbGeQ.js +2013 -0
- package/dist/{lz4-e899c949.js → lz4-DTu7K31c.js} +2 -5
- package/dist/{lzw-c11a1966.js → lzw-CK4bv4RP.js} +1 -3
- package/dist/{packbits-05dadc65.js → packbits-DxIRXT2p.js} +1 -3
- package/dist/{pako.esm-68f84e2a.js → pako.esm-SxljTded.js} +33 -1839
- package/dist/{raw-085aef44.js → raw-X87oynR1.js} +1 -3
- package/dist/{troika-three-text.esm-9db53f4c.js → troika-three-text.esm-BxbGY7j2.js} +277 -517
- package/dist/{webimage-184e90fa.js → webimage-BEDaZiLw.js} +1 -3
- package/dist/{zlib-175cd38d.js → zlib-ZTk3sZPP.js} +2 -5
- package/dist/{zstd-3a6a34b1.js → zstd-DNA9nISO.js} +2 -5
- package/package.json +9 -9
- package/dist/lerc-bfc1a927.js +0 -2005
- /package/dist/{chunk-INHXZS53-bee20a28.js → chunk-INHXZS53-DHVJiuU3.js} +0 -0
|
@@ -1,21 +1,16 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import "react";
|
|
3
|
-
import "react-dom";
|
|
1
|
+
import { bF as MeshDistanceMaterial, bG as MeshDepthMaterial, bH as RGBADepthPacking, aC as UniformsUtils, bI as ShaderChunk, ax as InstancedBufferGeometry, aw as Sphere, av as Box3, aI as BackSide, aa as DoubleSide, ae as Mesh, at as FrontSide, ab as MeshBasicMaterial, j as Color, d as Vector3, l as Matrix4, e as Vector2, aK as Matrix3, aE as Vector4, T as Texture, a2 as LinearFilter, bJ as PlaneGeometry, h as BufferGeometry, ay as Float32BufferAttribute, bK as InstancedBufferAttribute } from "./index-DQ1XVscb.js";
|
|
4
2
|
function workerBootstrap() {
|
|
5
3
|
var modules = /* @__PURE__ */ Object.create(null);
|
|
6
4
|
function registerModule(ref, callback) {
|
|
7
5
|
var id = ref.id;
|
|
8
6
|
var name = ref.name;
|
|
9
7
|
var dependencies = ref.dependencies;
|
|
10
|
-
if (dependencies === void 0)
|
|
11
|
-
dependencies = [];
|
|
8
|
+
if (dependencies === void 0) dependencies = [];
|
|
12
9
|
var init = ref.init;
|
|
13
|
-
if (init === void 0)
|
|
14
|
-
|
|
15
|
-
};
|
|
10
|
+
if (init === void 0) init = function() {
|
|
11
|
+
};
|
|
16
12
|
var getTransferables = ref.getTransferables;
|
|
17
|
-
if (getTransferables === void 0)
|
|
18
|
-
getTransferables = null;
|
|
13
|
+
if (getTransferables === void 0) getTransferables = null;
|
|
19
14
|
if (modules[id]) {
|
|
20
15
|
return;
|
|
21
16
|
}
|
|
@@ -158,8 +153,7 @@ function workerBootstrap() {
|
|
|
158
153
|
function defineMainThreadModule(options) {
|
|
159
154
|
var moduleFunc = function() {
|
|
160
155
|
var args = [], len = arguments.length;
|
|
161
|
-
while (len--)
|
|
162
|
-
args[len] = arguments[len];
|
|
156
|
+
while (len--) args[len] = arguments[len];
|
|
163
157
|
return moduleFunc._getInitResult().then(function(initResult) {
|
|
164
158
|
if (typeof initResult === "function") {
|
|
165
159
|
return initResult.apply(void 0, args);
|
|
@@ -196,9 +190,7 @@ var supportsWorkers = function() {
|
|
|
196
190
|
worker.terminate();
|
|
197
191
|
supported = true;
|
|
198
192
|
} catch (err) {
|
|
199
|
-
|
|
200
|
-
;
|
|
201
|
-
else {
|
|
193
|
+
{
|
|
202
194
|
console.log(
|
|
203
195
|
"Troika createWorkerModule: web workers not allowed; falling back to main thread execution. Cause: [" + err.message + "]"
|
|
204
196
|
);
|
|
@@ -250,8 +242,7 @@ function defineWorkerModule(options) {
|
|
|
250
242
|
});
|
|
251
243
|
function moduleFunc() {
|
|
252
244
|
var args = [], len = arguments.length;
|
|
253
|
-
while (len--)
|
|
254
|
-
args[len] = arguments[len];
|
|
245
|
+
while (len--) args[len] = arguments[len];
|
|
255
246
|
if (!registrationPromise) {
|
|
256
247
|
registrationPromise = callWorker(workerId, "registerModule", moduleFunc.workerModuleData);
|
|
257
248
|
var unregister = function() {
|
|
@@ -385,8 +376,7 @@ function SDFGenerator() {
|
|
|
385
376
|
}
|
|
386
377
|
}
|
|
387
378
|
function pathToLineSegments(pathString, segmentCallback, curvePoints) {
|
|
388
|
-
if (curvePoints === void 0)
|
|
389
|
-
curvePoints = 16;
|
|
379
|
+
if (curvePoints === void 0) curvePoints = 16;
|
|
390
380
|
var tempPoint = { x: 0, y: 0 };
|
|
391
381
|
forEachPathCommand(pathString, function(command, startX, startY, endX, endY, ctrl1X, ctrl1Y, ctrl2X, ctrl2Y) {
|
|
392
382
|
switch (command) {
|
|
@@ -480,8 +470,7 @@ function SDFGenerator() {
|
|
|
480
470
|
func2({
|
|
481
471
|
setUniform: function setUniform(type, name2) {
|
|
482
472
|
var values = [], len = arguments.length - 2;
|
|
483
|
-
while (len-- > 0)
|
|
484
|
-
values[len] = arguments[len + 2];
|
|
473
|
+
while (len-- > 0) values[len] = arguments[len + 2];
|
|
485
474
|
var uniformLoc = uniforms[name2] || (uniforms[name2] = gl.getUniformLocation(program, name2));
|
|
486
475
|
gl["uniform" + type].apply(gl, [uniformLoc].concat(values));
|
|
487
476
|
},
|
|
@@ -572,10 +561,8 @@ function SDFGenerator() {
|
|
|
572
561
|
callback(wrapper);
|
|
573
562
|
}
|
|
574
563
|
function renderImageData(glOrCanvas, imageData, x, y, width, height, channels, framebuffer) {
|
|
575
|
-
if (channels === void 0)
|
|
576
|
-
|
|
577
|
-
if (framebuffer === void 0)
|
|
578
|
-
framebuffer = null;
|
|
564
|
+
if (channels === void 0) channels = 15;
|
|
565
|
+
if (framebuffer === void 0) framebuffer = null;
|
|
579
566
|
withWebGLContext(glOrCanvas, function(ref) {
|
|
580
567
|
var gl = ref.gl;
|
|
581
568
|
var withProgram = ref.withProgram;
|
|
@@ -616,8 +603,7 @@ function SDFGenerator() {
|
|
|
616
603
|
resizeWebGLCanvasWithoutClearing: resizeWebGLCanvasWithoutClearing2
|
|
617
604
|
});
|
|
618
605
|
function generate$2(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent) {
|
|
619
|
-
if (sdfExponent === void 0)
|
|
620
|
-
sdfExponent = 1;
|
|
606
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
|
621
607
|
var textureData = new Uint8Array(sdfWidth * sdfHeight);
|
|
622
608
|
var viewBoxWidth = viewBox[2] - viewBox[0];
|
|
623
609
|
var viewBoxHeight = viewBox[3] - viewBox[1];
|
|
@@ -689,25 +675,17 @@ function SDFGenerator() {
|
|
|
689
675
|
}
|
|
690
676
|
}
|
|
691
677
|
function generateIntoCanvas$2(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, x, y, channel) {
|
|
692
|
-
if (sdfExponent === void 0)
|
|
693
|
-
|
|
694
|
-
if (
|
|
695
|
-
|
|
696
|
-
if (y === void 0)
|
|
697
|
-
y = 0;
|
|
698
|
-
if (channel === void 0)
|
|
699
|
-
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;
|
|
700
682
|
generateIntoFramebuffer$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, null, x, y, channel);
|
|
701
683
|
}
|
|
702
684
|
function generateIntoFramebuffer$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, glOrCanvas, framebuffer, x, y, channel) {
|
|
703
|
-
if (sdfExponent === void 0)
|
|
704
|
-
|
|
705
|
-
if (
|
|
706
|
-
|
|
707
|
-
if (y === void 0)
|
|
708
|
-
y = 0;
|
|
709
|
-
if (channel === void 0)
|
|
710
|
-
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;
|
|
711
689
|
var data = generate$2(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent);
|
|
712
690
|
var rgbaData = new Uint8Array(data.length * 4);
|
|
713
691
|
for (var i = 0; i < data.length; i++) {
|
|
@@ -744,10 +722,8 @@ function SDFGenerator() {
|
|
|
744
722
|
}
|
|
745
723
|
}
|
|
746
724
|
function generate$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, glOrCanvas) {
|
|
747
|
-
if (sdfExponent === void 0)
|
|
748
|
-
|
|
749
|
-
if (glOrCanvas === void 0)
|
|
750
|
-
glOrCanvas = null;
|
|
725
|
+
if (sdfExponent === void 0) sdfExponent = 1;
|
|
726
|
+
if (glOrCanvas === void 0) glOrCanvas = null;
|
|
751
727
|
if (!glOrCanvas) {
|
|
752
728
|
glOrCanvas = implicitContext;
|
|
753
729
|
if (!glOrCanvas) {
|
|
@@ -792,25 +768,17 @@ function SDFGenerator() {
|
|
|
792
768
|
return data;
|
|
793
769
|
}
|
|
794
770
|
function generateIntoCanvas$1(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, x, y, channel) {
|
|
795
|
-
if (sdfExponent === void 0)
|
|
796
|
-
|
|
797
|
-
if (
|
|
798
|
-
|
|
799
|
-
if (y === void 0)
|
|
800
|
-
y = 0;
|
|
801
|
-
if (channel === void 0)
|
|
802
|
-
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;
|
|
803
775
|
generateIntoFramebuffer(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, null, x, y, channel);
|
|
804
776
|
}
|
|
805
777
|
function generateIntoFramebuffer(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, glOrCanvas, framebuffer, x, y, channel) {
|
|
806
|
-
if (sdfExponent === void 0)
|
|
807
|
-
|
|
808
|
-
if (
|
|
809
|
-
|
|
810
|
-
if (y === void 0)
|
|
811
|
-
y = 0;
|
|
812
|
-
if (channel === void 0)
|
|
813
|
-
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;
|
|
814
782
|
validateSupport(glOrCanvas);
|
|
815
783
|
var lineSegmentCoords = [];
|
|
816
784
|
pathToLineSegments(path, function(x1, y1, x2, y2) {
|
|
@@ -942,10 +910,8 @@ function SDFGenerator() {
|
|
|
942
910
|
isSupported
|
|
943
911
|
});
|
|
944
912
|
function generate(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent) {
|
|
945
|
-
if (maxDistance === void 0)
|
|
946
|
-
|
|
947
|
-
if (sdfExponent === void 0)
|
|
948
|
-
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;
|
|
949
915
|
try {
|
|
950
916
|
return generate$1.apply(webgl, arguments);
|
|
951
917
|
} catch (e) {
|
|
@@ -954,16 +920,11 @@ function SDFGenerator() {
|
|
|
954
920
|
}
|
|
955
921
|
}
|
|
956
922
|
function generateIntoCanvas(sdfWidth, sdfHeight, path, viewBox, maxDistance, sdfExponent, canvas, x, y, channel) {
|
|
957
|
-
if (maxDistance === void 0)
|
|
958
|
-
|
|
959
|
-
if (
|
|
960
|
-
|
|
961
|
-
if (
|
|
962
|
-
x = 0;
|
|
963
|
-
if (y === void 0)
|
|
964
|
-
y = 0;
|
|
965
|
-
if (channel === void 0)
|
|
966
|
-
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;
|
|
967
928
|
try {
|
|
968
929
|
return generateIntoCanvas$1.apply(webgl, arguments);
|
|
969
930
|
} catch (e) {
|
|
@@ -1043,8 +1004,7 @@ function bidiFactory() {
|
|
|
1043
1004
|
});
|
|
1044
1005
|
}
|
|
1045
1006
|
};
|
|
1046
|
-
for (var type in DATA)
|
|
1047
|
-
loop(type);
|
|
1007
|
+
for (var type in DATA) loop(type);
|
|
1048
1008
|
}
|
|
1049
1009
|
}
|
|
1050
1010
|
function getBidiCharType(char) {
|
|
@@ -1918,10 +1878,8 @@ function createDerivedMaterial(baseMaterial, options) {
|
|
|
1918
1878
|
configurable: true,
|
|
1919
1879
|
value() {
|
|
1920
1880
|
const { _depthMaterial, _distanceMaterial } = this;
|
|
1921
|
-
if (_depthMaterial)
|
|
1922
|
-
|
|
1923
|
-
if (_distanceMaterial)
|
|
1924
|
-
_distanceMaterial.dispose();
|
|
1881
|
+
if (_depthMaterial) _depthMaterial.dispose();
|
|
1882
|
+
if (_distanceMaterial) _distanceMaterial.dispose();
|
|
1925
1883
|
baseMaterial.dispose.call(this);
|
|
1926
1884
|
}
|
|
1927
1885
|
}
|
|
@@ -2089,8 +2047,7 @@ function typrFactory() {
|
|
|
2089
2047
|
var h = n.readASCII(r2, s, 4);
|
|
2090
2048
|
s += 4, n.readUint(r2, s), s += 4;
|
|
2091
2049
|
var d = n.readUint(r2, s);
|
|
2092
|
-
if (s += 4, n.readUint(r2, s), s += 4, h == t2)
|
|
2093
|
-
return d;
|
|
2050
|
+
if (s += 4, n.readUint(r2, s), s += 4, h == t2) return d;
|
|
2094
2051
|
}
|
|
2095
2052
|
return 0;
|
|
2096
2053
|
} };
|
|
@@ -2107,16 +2064,14 @@ function typrFactory() {
|
|
|
2107
2064
|
}, readUshort: function(r2, t2) {
|
|
2108
2065
|
return e._bin._view(r2).getUint16(t2);
|
|
2109
2066
|
}, readUshorts: function(r2, t2, a2) {
|
|
2110
|
-
for (var n = [], o = 0; o < a2; o++)
|
|
2111
|
-
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));
|
|
2112
2068
|
return n;
|
|
2113
2069
|
}, readUint: function(r2, t2) {
|
|
2114
2070
|
return e._bin._view(r2).getUint32(t2);
|
|
2115
2071
|
}, readUint64: function(r2, t2) {
|
|
2116
2072
|
return 4294967296 * e._bin.readUint(r2, t2) + e._bin.readUint(r2, t2 + 4);
|
|
2117
2073
|
}, readASCII: function(r2, e2, t2) {
|
|
2118
|
-
for (var a2 = "", n = 0; n < t2; n++)
|
|
2119
|
-
a2 += String.fromCharCode(r2[e2 + n]);
|
|
2074
|
+
for (var a2 = "", n = 0; n < t2; n++) a2 += String.fromCharCode(r2[e2 + n]);
|
|
2120
2075
|
return a2;
|
|
2121
2076
|
}, readUnicode: function(r2, e2, t2) {
|
|
2122
2077
|
for (var a2 = "", n = 0; n < t2; n++) {
|
|
@@ -2128,12 +2083,10 @@ function typrFactory() {
|
|
|
2128
2083
|
var n = e._bin._tdec;
|
|
2129
2084
|
return n && 0 == t2 && a2 == r2.length ? n.decode(r2) : e._bin.readASCII(r2, t2, a2);
|
|
2130
2085
|
}, readBytes: function(r2, e2, t2) {
|
|
2131
|
-
for (var a2 = [], n = 0; n < t2; n++)
|
|
2132
|
-
a2.push(r2[e2 + n]);
|
|
2086
|
+
for (var a2 = [], n = 0; n < t2; n++) a2.push(r2[e2 + n]);
|
|
2133
2087
|
return a2;
|
|
2134
2088
|
}, readASCIIArray: function(r2, e2, t2) {
|
|
2135
|
-
for (var a2 = [], n = 0; n < t2; n++)
|
|
2136
|
-
a2.push(String.fromCharCode(r2[e2 + n]));
|
|
2089
|
+
for (var a2 = [], n = 0; n < t2; n++) a2.push(String.fromCharCode(r2[e2 + n]));
|
|
2137
2090
|
return a2;
|
|
2138
2091
|
}, _view: function(r2) {
|
|
2139
2092
|
return r2._dataView || (r2._dataView = r2.buffer ? new DataView(r2.buffer, r2.byteOffset, r2.byteLength) : new DataView(new Uint8Array(r2).buffer));
|
|
@@ -2169,8 +2122,7 @@ function typrFactory() {
|
|
|
2169
2122
|
}
|
|
2170
2123
|
return s;
|
|
2171
2124
|
}, e._lctf.numOfOnes = function(r2) {
|
|
2172
|
-
for (var e2 = 0, t2 = 0; t2 < 32; t2++)
|
|
2173
|
-
0 != (r2 >>> t2 & 1) && e2++;
|
|
2125
|
+
for (var e2 = 0, t2 = 0; t2 < 32; t2++) 0 != (r2 >>> t2 & 1) && e2++;
|
|
2174
2126
|
return e2;
|
|
2175
2127
|
}, e._lctf.readClassDef = function(r2, t2) {
|
|
2176
2128
|
var a2 = e._bin, n = [], o = a2.readUshort(r2, t2);
|
|
@@ -2179,21 +2131,18 @@ function typrFactory() {
|
|
|
2179
2131
|
t2 += 2;
|
|
2180
2132
|
var i = a2.readUshort(r2, t2);
|
|
2181
2133
|
t2 += 2;
|
|
2182
|
-
for (var h = 0; h < i; h++)
|
|
2183
|
-
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;
|
|
2184
2135
|
}
|
|
2185
2136
|
if (2 == o) {
|
|
2186
2137
|
var d = a2.readUshort(r2, t2);
|
|
2187
2138
|
t2 += 2;
|
|
2188
|
-
for (h = 0; h < d; h++)
|
|
2189
|
-
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;
|
|
2190
2140
|
}
|
|
2191
2141
|
return n;
|
|
2192
2142
|
}, e._lctf.getInterval = function(r2, e2) {
|
|
2193
2143
|
for (var t2 = 0; t2 < r2.length; t2 += 3) {
|
|
2194
2144
|
var a2 = r2[t2], n = r2[t2 + 1];
|
|
2195
|
-
if (r2[t2 + 2], a2 <= e2 && e2 <= n)
|
|
2196
|
-
return t2;
|
|
2145
|
+
if (r2[t2 + 2], a2 <= e2 && e2 <= n) return t2;
|
|
2197
2146
|
}
|
|
2198
2147
|
return -1;
|
|
2199
2148
|
}, e._lctf.readCoverage = function(r2, t2) {
|
|
@@ -2203,12 +2152,10 @@ function typrFactory() {
|
|
|
2203
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;
|
|
2204
2153
|
}, e._lctf.coverageIndex = function(r2, t2) {
|
|
2205
2154
|
var a2 = r2.tab;
|
|
2206
|
-
if (1 == r2.fmt)
|
|
2207
|
-
return a2.indexOf(t2);
|
|
2155
|
+
if (1 == r2.fmt) return a2.indexOf(t2);
|
|
2208
2156
|
if (2 == r2.fmt) {
|
|
2209
2157
|
var n = e._lctf.getInterval(a2, t2);
|
|
2210
|
-
if (-1 != n)
|
|
2211
|
-
return a2[n + 2] + (t2 - a2[n]);
|
|
2158
|
+
if (-1 != n) return a2[n + 2] + (t2 - a2[n]);
|
|
2212
2159
|
}
|
|
2213
2160
|
return -1;
|
|
2214
2161
|
}, e._lctf.readFeatureList = function(r2, t2) {
|
|
@@ -2228,8 +2175,7 @@ function typrFactory() {
|
|
|
2228
2175
|
t2 += 2, s > 0 && (o.featureParams = n + s);
|
|
2229
2176
|
var i = a2.readUshort(r2, t2);
|
|
2230
2177
|
t2 += 2, o.tab = [];
|
|
2231
|
-
for (var h = 0; h < i; h++)
|
|
2232
|
-
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));
|
|
2233
2179
|
return o;
|
|
2234
2180
|
}, e._lctf.readScriptList = function(r2, t2) {
|
|
2235
2181
|
var a2 = e._bin, n = t2, o = {}, s = a2.readUshort(r2, t2);
|
|
@@ -2263,27 +2209,23 @@ function typrFactory() {
|
|
|
2263
2209
|
(r2 = new Uint8Array(r2.buffer, t2, a2))[t2 = 0], r2[++t2], r2[++t2], r2[++t2], t2++;
|
|
2264
2210
|
var o = [];
|
|
2265
2211
|
t2 = e.CFF.readIndex(r2, t2, o);
|
|
2266
|
-
for (var s = [], i = 0; i < o.length - 1; i++)
|
|
2267
|
-
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]));
|
|
2268
2213
|
t2 += o[o.length - 1];
|
|
2269
2214
|
var h = [];
|
|
2270
2215
|
t2 = e.CFF.readIndex(r2, t2, h);
|
|
2271
2216
|
var d = [];
|
|
2272
|
-
for (i = 0; i < h.length - 1; i++)
|
|
2273
|
-
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]));
|
|
2274
2218
|
t2 += h[h.length - 1];
|
|
2275
2219
|
var f = d[0], u = [];
|
|
2276
2220
|
t2 = e.CFF.readIndex(r2, t2, u);
|
|
2277
2221
|
var l = [];
|
|
2278
|
-
for (i = 0; i < u.length - 1; i++)
|
|
2279
|
-
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]));
|
|
2280
2223
|
if (t2 += u[u.length - 1], e.CFF.readSubrs(r2, t2, f), f.CharStrings) {
|
|
2281
2224
|
t2 = f.CharStrings;
|
|
2282
2225
|
u = [];
|
|
2283
2226
|
t2 = e.CFF.readIndex(r2, t2, u);
|
|
2284
2227
|
var v = [];
|
|
2285
|
-
for (i = 0; i < u.length - 1; i++)
|
|
2286
|
-
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]));
|
|
2287
2229
|
f.CharStrings = v;
|
|
2288
2230
|
}
|
|
2289
2231
|
if (f.ROS) {
|
|
@@ -2296,75 +2238,57 @@ function typrFactory() {
|
|
|
2296
2238
|
}
|
|
2297
2239
|
t2 += c[c.length - 1], t2 = f.FDSelect, f.FDSelect = [];
|
|
2298
2240
|
var U = r2[t2];
|
|
2299
|
-
if (t2++, 3 != U)
|
|
2300
|
-
throw U;
|
|
2241
|
+
if (t2++, 3 != U) throw U;
|
|
2301
2242
|
var g = n.readUshort(r2, t2);
|
|
2302
2243
|
t2 += 2;
|
|
2303
|
-
for (i = 0; i < g + 1; i++)
|
|
2304
|
-
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;
|
|
2305
2245
|
}
|
|
2306
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;
|
|
2307
2247
|
}, e.CFF._readFDict = function(r2, t2, a2) {
|
|
2308
2248
|
var n;
|
|
2309
|
-
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)
|
|
2310
|
-
-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]);
|
|
2311
2250
|
}, e.CFF.readSubrs = function(r2, t2, a2) {
|
|
2312
2251
|
var n = e._bin, o = [];
|
|
2313
2252
|
t2 = e.CFF.readIndex(r2, t2, o);
|
|
2314
2253
|
var s, i = o.length;
|
|
2315
2254
|
s = i < 1240 ? 107 : i < 33900 ? 1131 : 32768, a2.Bias = s, a2.Subrs = [];
|
|
2316
|
-
for (var h = 0; h < o.length - 1; h++)
|
|
2317
|
-
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]));
|
|
2318
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) {
|
|
2319
|
-
for (var t2 = 0; t2 < r2.charset.length; t2++)
|
|
2320
|
-
if (r2.charset[t2] == e2)
|
|
2321
|
-
return t2;
|
|
2257
|
+
for (var t2 = 0; t2 < r2.charset.length; t2++) if (r2.charset[t2] == e2) return t2;
|
|
2322
2258
|
return -1;
|
|
2323
2259
|
}, e.CFF.glyphBySE = function(r2, t2) {
|
|
2324
2260
|
return t2 < 0 || t2 > 255 ? -1 : e.CFF.glyphByUnicode(r2, e.CFF.tableSE[t2]);
|
|
2325
2261
|
}, e.CFF.readEncoding = function(r2, t2, a2) {
|
|
2326
2262
|
e._bin;
|
|
2327
2263
|
var n = [".notdef"], o = r2[t2];
|
|
2328
|
-
if (t2++, 0 != o)
|
|
2329
|
-
throw "error: unknown encoding format: " + o;
|
|
2264
|
+
if (t2++, 0 != o) throw "error: unknown encoding format: " + o;
|
|
2330
2265
|
var s = r2[t2];
|
|
2331
2266
|
t2++;
|
|
2332
|
-
for (var i = 0; i < s; i++)
|
|
2333
|
-
n.push(r2[t2 + i]);
|
|
2267
|
+
for (var i = 0; i < s; i++) n.push(r2[t2 + i]);
|
|
2334
2268
|
return n;
|
|
2335
2269
|
}, e.CFF.readCharset = function(r2, t2, a2) {
|
|
2336
2270
|
var n = e._bin, o = [".notdef"], s = r2[t2];
|
|
2337
|
-
if (t2++, 0 == s)
|
|
2338
|
-
|
|
2339
|
-
|
|
2340
|
-
|
|
2341
|
-
}
|
|
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
|
+
}
|
|
2342
2275
|
else {
|
|
2343
|
-
if (1 != s && 2 != s)
|
|
2344
|
-
throw "error: format: " + s;
|
|
2276
|
+
if (1 != s && 2 != s) throw "error: format: " + s;
|
|
2345
2277
|
for (; o.length < a2; ) {
|
|
2346
2278
|
h = n.readUshort(r2, t2);
|
|
2347
2279
|
t2 += 2;
|
|
2348
2280
|
var d = 0;
|
|
2349
2281
|
1 == s ? (d = r2[t2], t2++) : (d = n.readUshort(r2, t2), t2 += 2);
|
|
2350
|
-
for (i = 0; i <= d; i++)
|
|
2351
|
-
o.push(h), h++;
|
|
2282
|
+
for (i = 0; i <= d; i++) o.push(h), h++;
|
|
2352
2283
|
}
|
|
2353
2284
|
}
|
|
2354
2285
|
return o;
|
|
2355
2286
|
}, e.CFF.readIndex = function(r2, t2, a2) {
|
|
2356
2287
|
var n = e._bin, o = n.readUshort(r2, t2) + 1, s = r2[t2 += 2];
|
|
2357
|
-
if (t2++, 1 == s)
|
|
2358
|
-
|
|
2359
|
-
|
|
2360
|
-
else if (
|
|
2361
|
-
for (i = 0; i < o; i++)
|
|
2362
|
-
a2.push(n.readUshort(r2, t2 + 2 * i));
|
|
2363
|
-
else if (3 == s)
|
|
2364
|
-
for (i = 0; i < o; i++)
|
|
2365
|
-
a2.push(16777215 & n.readUint(r2, t2 + 3 * i - 1));
|
|
2366
|
-
else if (1 != o)
|
|
2367
|
-
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;
|
|
2368
2292
|
return (t2 += o * s) - 1;
|
|
2369
2293
|
}, e.CFF.getCharString = function(r2, t2, a2) {
|
|
2370
2294
|
var n = e._bin, o = r2[t2], s = r2[t2 + 1];
|
|
@@ -2384,24 +2308,20 @@ function typrFactory() {
|
|
|
2384
2308
|
var i = r2[t2], h = r2[t2 + 1];
|
|
2385
2309
|
r2[t2 + 2], r2[t2 + 3], r2[t2 + 4];
|
|
2386
2310
|
var d = 1, f = null, u = null;
|
|
2387
|
-
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)
|
|
2388
|
-
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";
|
|
2389
2312
|
if (30 == i) {
|
|
2390
2313
|
var l = [];
|
|
2391
2314
|
for (d = 1; ; ) {
|
|
2392
2315
|
var v = r2[t2 + d];
|
|
2393
2316
|
d++;
|
|
2394
2317
|
var c = v >> 4, p = 15 & v;
|
|
2395
|
-
if (15 != c && l.push(c), 15 != p && l.push(p), 15 == p)
|
|
2396
|
-
break;
|
|
2318
|
+
if (15 != c && l.push(c), 15 != p && l.push(p), 15 == p) break;
|
|
2397
2319
|
}
|
|
2398
|
-
for (var U = "", g = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ".", "e", "e-", "reserved", "-", "endOfNumber"], S = 0; S < l.length; S++)
|
|
2399
|
-
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]];
|
|
2400
2321
|
u = parseFloat(U);
|
|
2401
2322
|
}
|
|
2402
2323
|
if (i <= 21) {
|
|
2403
|
-
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)
|
|
2404
|
-
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;
|
|
2405
2325
|
}
|
|
2406
2326
|
null != f ? (o[f] = 1 == s.length ? s[0] : s, s = []) : s.push(u), t2 += d;
|
|
2407
2327
|
}
|
|
@@ -2428,8 +2348,7 @@ function typrFactory() {
|
|
|
2428
2348
|
var p = n.readUshort(r2, u);
|
|
2429
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);
|
|
2430
2350
|
}
|
|
2431
|
-
if (null != o[l])
|
|
2432
|
-
throw "multiple tables for one platform+encoding";
|
|
2351
|
+
if (null != o[l]) throw "multiple tables for one platform+encoding";
|
|
2433
2352
|
o[l] = v;
|
|
2434
2353
|
}
|
|
2435
2354
|
return o;
|
|
@@ -2438,8 +2357,7 @@ function typrFactory() {
|
|
|
2438
2357
|
n.format = a2.readUshort(r2, t2), t2 += 2;
|
|
2439
2358
|
var o = a2.readUshort(r2, t2);
|
|
2440
2359
|
t2 += 2, a2.readUshort(r2, t2), t2 += 2, n.map = [];
|
|
2441
|
-
for (var s = 0; s < o - 6; s++)
|
|
2442
|
-
n.map.push(r2[t2 + s]);
|
|
2360
|
+
for (var s = 0; s < o - 6; s++) n.map.push(r2[t2 + s]);
|
|
2443
2361
|
return n;
|
|
2444
2362
|
}, e.cmap.parse4 = function(r2, t2) {
|
|
2445
2363
|
var a2 = e._bin, n = t2, o = {};
|
|
@@ -2450,18 +2368,15 @@ function typrFactory() {
|
|
|
2450
2368
|
t2 += 2;
|
|
2451
2369
|
var h = i / 2;
|
|
2452
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 = [];
|
|
2453
|
-
for (var d = 0; d < h; d++)
|
|
2454
|
-
|
|
2455
|
-
for (o.idRangeOffset = a2.readUshorts(r2, t2, h), t2 += 2 * h, o.glyphIdArray = []; t2 < n + s; )
|
|
2456
|
-
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;
|
|
2457
2373
|
return o;
|
|
2458
2374
|
}, e.cmap.parse6 = function(r2, t2) {
|
|
2459
2375
|
var a2 = e._bin, n = {};
|
|
2460
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;
|
|
2461
2377
|
var o = a2.readUshort(r2, t2);
|
|
2462
2378
|
t2 += 2, n.glyphIdArray = [];
|
|
2463
|
-
for (var s = 0; s < o; s++)
|
|
2464
|
-
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;
|
|
2465
2380
|
return n;
|
|
2466
2381
|
}, e.cmap.parse12 = function(r2, t2) {
|
|
2467
2382
|
var a2 = e._bin, n = {};
|
|
@@ -2474,23 +2389,18 @@ function typrFactory() {
|
|
|
2474
2389
|
}
|
|
2475
2390
|
return n;
|
|
2476
2391
|
}, e.glyf = {}, e.glyf.parse = function(r2, e2, t2, a2) {
|
|
2477
|
-
for (var n = [], o = 0; o < a2.maxp.numGlyphs; o++)
|
|
2478
|
-
n.push(null);
|
|
2392
|
+
for (var n = [], o = 0; o < a2.maxp.numGlyphs; o++) n.push(null);
|
|
2479
2393
|
return n;
|
|
2480
2394
|
}, e.glyf._parseGlyf = function(r2, t2) {
|
|
2481
2395
|
var a2 = e._bin, n = r2._data, o = e._tabOffset(n, "glyf", r2._offset) + r2.loca[t2];
|
|
2482
|
-
if (r2.loca[t2] == r2.loca[t2 + 1])
|
|
2483
|
-
return null;
|
|
2396
|
+
if (r2.loca[t2] == r2.loca[t2 + 1]) return null;
|
|
2484
2397
|
var s = {};
|
|
2485
|
-
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)
|
|
2486
|
-
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;
|
|
2487
2399
|
if (s.noc > 0) {
|
|
2488
2400
|
s.endPts = [];
|
|
2489
|
-
for (var i = 0; i < s.noc; i++)
|
|
2490
|
-
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;
|
|
2491
2402
|
var h = a2.readUshort(n, o);
|
|
2492
|
-
if (o += 2, n.length - o < h)
|
|
2493
|
-
return null;
|
|
2403
|
+
if (o += 2, n.length - o < h) return null;
|
|
2494
2404
|
s.instructions = a2.readBytes(n, o, h), o += h;
|
|
2495
2405
|
var d = s.endPts[s.noc - 1] + 1;
|
|
2496
2406
|
s.flags = [];
|
|
@@ -2499,8 +2409,7 @@ function typrFactory() {
|
|
|
2499
2409
|
if (o++, s.flags.push(f), 0 != (8 & f)) {
|
|
2500
2410
|
var u = n[o];
|
|
2501
2411
|
o++;
|
|
2502
|
-
for (var l = 0; l < u; l++)
|
|
2503
|
-
s.flags.push(f), i++;
|
|
2412
|
+
for (var l = 0; l < u; l++) s.flags.push(f), i++;
|
|
2504
2413
|
}
|
|
2505
2414
|
}
|
|
2506
2415
|
s.xs = [];
|
|
@@ -2514,8 +2423,7 @@ function typrFactory() {
|
|
|
2514
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);
|
|
2515
2424
|
}
|
|
2516
2425
|
var p = 0, U = 0;
|
|
2517
|
-
for (i = 0; i < d; i++)
|
|
2518
|
-
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;
|
|
2519
2427
|
} else {
|
|
2520
2428
|
var g;
|
|
2521
2429
|
s.parts = [];
|
|
@@ -2538,8 +2446,7 @@ function typrFactory() {
|
|
|
2538
2446
|
if (256 & g) {
|
|
2539
2447
|
var y = a2.readUshort(n, o);
|
|
2540
2448
|
o += 2, s.instr = [];
|
|
2541
|
-
for (i = 0; i < y; i++)
|
|
2542
|
-
s.instr.push(n[o]), o++;
|
|
2449
|
+
for (i = 0; i < y; i++) s.instr.push(n[o]), o++;
|
|
2543
2450
|
}
|
|
2544
2451
|
}
|
|
2545
2452
|
return s;
|
|
@@ -2599,19 +2506,15 @@ function typrFactory() {
|
|
|
2599
2506
|
i.matrix.push(_);
|
|
2600
2507
|
}
|
|
2601
2508
|
}
|
|
2602
|
-
} else if (4 == t2 && 1 == i.fmt)
|
|
2603
|
-
|
|
2604
|
-
else if (6 == t2 && 1 == i.fmt)
|
|
2605
|
-
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);
|
|
2606
2511
|
else {
|
|
2607
2512
|
if (9 == t2 && 1 == i.fmt) {
|
|
2608
2513
|
var I = o.readUshort(r2, a2);
|
|
2609
2514
|
a2 += 2;
|
|
2610
2515
|
var w = o.readUint(r2, a2);
|
|
2611
|
-
if (a2 += 4, 9 == n.ltype)
|
|
2612
|
-
|
|
2613
|
-
else if (n.ltype != I)
|
|
2614
|
-
throw "invalid extension substitution";
|
|
2516
|
+
if (a2 += 4, 9 == n.ltype) n.ltype = I;
|
|
2517
|
+
else if (n.ltype != I) throw "invalid extension substitution";
|
|
2615
2518
|
return e.GPOS.subt(r2, n.ltype, s + w);
|
|
2616
2519
|
}
|
|
2617
2520
|
console.debug("unsupported GPOS table LookupType", t2, "format", i.fmt);
|
|
@@ -2624,8 +2527,7 @@ function typrFactory() {
|
|
|
2624
2527
|
var n = e._bin, o = [], s = t2, i = n.readUshort(r2, t2);
|
|
2625
2528
|
t2 += 2;
|
|
2626
2529
|
for (var h = 0; h < i; h++) {
|
|
2627
|
-
for (var d = [], f = 0; f < a2; f++)
|
|
2628
|
-
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;
|
|
2629
2531
|
o.push(d);
|
|
2630
2532
|
}
|
|
2631
2533
|
return o;
|
|
@@ -2644,15 +2546,13 @@ function typrFactory() {
|
|
|
2644
2546
|
return e._lctf.parse(r2, t2, a2, n, e.GSUB.subt);
|
|
2645
2547
|
}, e.GSUB.subt = function(r2, t2, a2, n) {
|
|
2646
2548
|
var o = e._bin, s = a2, i = {};
|
|
2647
|
-
if (i.fmt = o.readUshort(r2, a2), a2 += 2, 1 != t2 && 2 != t2 && 4 != t2 && 5 != t2 && 6 != t2)
|
|
2648
|
-
return null;
|
|
2549
|
+
if (i.fmt = o.readUshort(r2, a2), a2 += 2, 1 != t2 && 2 != t2 && 4 != t2 && 5 != t2 && 6 != t2) return null;
|
|
2649
2550
|
if (1 == t2 || 2 == t2 || 4 == t2 || 5 == t2 && i.fmt <= 2 || 6 == t2 && i.fmt <= 2) {
|
|
2650
2551
|
var h = o.readUshort(r2, a2);
|
|
2651
2552
|
a2 += 2, i.coverage = e._lctf.readCoverage(r2, s + h);
|
|
2652
2553
|
}
|
|
2653
2554
|
if (1 == t2 && i.fmt >= 1 && i.fmt <= 2) {
|
|
2654
|
-
if (1 == i.fmt)
|
|
2655
|
-
i.delta = o.readShort(r2, a2), a2 += 2;
|
|
2555
|
+
if (1 == i.fmt) i.delta = o.readShort(r2, a2), a2 += 2;
|
|
2656
2556
|
else if (2 == i.fmt) {
|
|
2657
2557
|
var d = o.readUshort(r2, a2);
|
|
2658
2558
|
a2 += 2, i.newg = o.readUshorts(r2, a2, d), a2 += 2 * i.newg.length;
|
|
@@ -2690,8 +2590,7 @@ function typrFactory() {
|
|
|
2690
2590
|
for (f = 0; f < 3; f++) {
|
|
2691
2591
|
d = o.readUshort(r2, a2);
|
|
2692
2592
|
a2 += 2;
|
|
2693
|
-
for (var g = [], S = 0; S < d; S++)
|
|
2694
|
-
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)));
|
|
2695
2594
|
a2 += 2 * d, 0 == f && (i.backCvg = g), 1 == f && (i.inptCvg = g), 2 == f && (i.ahedCvg = g);
|
|
2696
2595
|
}
|
|
2697
2596
|
d = o.readUshort(r2, a2);
|
|
@@ -2702,10 +2601,8 @@ function typrFactory() {
|
|
|
2702
2601
|
var m = o.readUshort(r2, a2);
|
|
2703
2602
|
a2 += 2;
|
|
2704
2603
|
var b = o.readUint(r2, a2);
|
|
2705
|
-
if (a2 += 4, 9 == n.ltype)
|
|
2706
|
-
|
|
2707
|
-
else if (n.ltype != m)
|
|
2708
|
-
throw "invalid extension substitution";
|
|
2604
|
+
if (a2 += 4, 9 == n.ltype) n.ltype = m;
|
|
2605
|
+
else if (n.ltype != m) throw "invalid extension substitution";
|
|
2709
2606
|
return e.GSUB.subt(r2, n.ltype, s + b);
|
|
2710
2607
|
}
|
|
2711
2608
|
console.debug("unsupported GSUB table LookupType", t2, "format", i.fmt);
|
|
@@ -2722,12 +2619,10 @@ function typrFactory() {
|
|
|
2722
2619
|
}, e.GSUB.readSubClassRule = function(r2, t2) {
|
|
2723
2620
|
var a2 = e._bin.readUshort, n = {}, o = a2(r2, t2), s = a2(r2, t2 += 2);
|
|
2724
2621
|
t2 += 2, n.input = [];
|
|
2725
|
-
for (var i = 0; i < o - 1; i++)
|
|
2726
|
-
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;
|
|
2727
2623
|
return n.substLookupRecords = e.GSUB.readSubstLookupRecords(r2, t2, s), n;
|
|
2728
2624
|
}, e.GSUB.readSubstLookupRecords = function(r2, t2, a2) {
|
|
2729
|
-
for (var n = e._bin.readUshort, o = [], s = 0; s < a2; s++)
|
|
2730
|
-
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;
|
|
2731
2626
|
return o;
|
|
2732
2627
|
}, e.GSUB.readChainSubClassSet = function(r2, t2) {
|
|
2733
2628
|
var a2 = e._bin, n = t2, o = [], s = a2.readUshort(r2, t2);
|
|
@@ -2757,8 +2652,7 @@ function typrFactory() {
|
|
|
2757
2652
|
n.nglyph = a2.readUshort(r2, t2), t2 += 2;
|
|
2758
2653
|
var o = a2.readUshort(r2, t2);
|
|
2759
2654
|
t2 += 2;
|
|
2760
|
-
for (var s = 0; s < o - 1; s++)
|
|
2761
|
-
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;
|
|
2762
2656
|
return n;
|
|
2763
2657
|
}, e.head = {}, e.head.parse = function(r2, t2, a2) {
|
|
2764
2658
|
var n = e._bin, o = {};
|
|
@@ -2767,13 +2661,11 @@ function typrFactory() {
|
|
|
2767
2661
|
var n = e._bin, o = {};
|
|
2768
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;
|
|
2769
2663
|
}, e.hmtx = {}, e.hmtx.parse = function(r2, t2, a2, n) {
|
|
2770
|
-
for (var o = e._bin, s = { aWidth: [], lsBearing: [] }, i = 0, h = 0, d = 0; d < n.maxp.numGlyphs; d++)
|
|
2771
|
-
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);
|
|
2772
2665
|
return s;
|
|
2773
2666
|
}, e.kern = {}, e.kern.parse = function(r2, t2, a2, n) {
|
|
2774
2667
|
var o = e._bin, s = o.readUshort(r2, t2);
|
|
2775
|
-
if (t2 += 2, 1 == s)
|
|
2776
|
-
return e.kern.parseV1(r2, t2 - 2, a2, n);
|
|
2668
|
+
if (t2 += 2, 1 == s) return e.kern.parseV1(r2, t2 - 2, a2, n);
|
|
2777
2669
|
var i = o.readUshort(r2, t2);
|
|
2778
2670
|
t2 += 2;
|
|
2779
2671
|
for (var h = { glyph1: [], rval: [] }, d = 0; d < i; d++) {
|
|
@@ -2783,8 +2675,7 @@ function typrFactory() {
|
|
|
2783
2675
|
var f = o.readUshort(r2, t2);
|
|
2784
2676
|
t2 += 2;
|
|
2785
2677
|
var u = f >>> 8;
|
|
2786
|
-
if (0 != (u &= 15))
|
|
2787
|
-
throw "unknown kern table format: " + u;
|
|
2678
|
+
if (0 != (u &= 15)) throw "unknown kern table format: " + u;
|
|
2788
2679
|
t2 = e.kern.readFormat0(r2, t2, h);
|
|
2789
2680
|
}
|
|
2790
2681
|
return h;
|
|
@@ -2798,8 +2689,7 @@ function typrFactory() {
|
|
|
2798
2689
|
var d = o.readUshort(r2, t2);
|
|
2799
2690
|
t2 += 2, o.readUshort(r2, t2), t2 += 2;
|
|
2800
2691
|
var f = d >>> 8;
|
|
2801
|
-
if (0 != (f &= 15))
|
|
2802
|
-
throw "unknown kern table format: " + f;
|
|
2692
|
+
if (0 != (f &= 15)) throw "unknown kern table format: " + f;
|
|
2803
2693
|
t2 = e.kern.readFormat0(r2, t2, i);
|
|
2804
2694
|
}
|
|
2805
2695
|
return i;
|
|
@@ -2819,12 +2709,8 @@ function typrFactory() {
|
|
|
2819
2709
|
return t2;
|
|
2820
2710
|
}, e.loca = {}, e.loca.parse = function(r2, t2, a2, n) {
|
|
2821
2711
|
var o = e._bin, s = [], i = n.head.indexToLocFormat, h = n.maxp.numGlyphs + 1;
|
|
2822
|
-
if (0 == i)
|
|
2823
|
-
|
|
2824
|
-
s.push(o.readUshort(r2, t2 + (d << 1)) << 1);
|
|
2825
|
-
if (1 == i)
|
|
2826
|
-
for (d = 0; d < h; d++)
|
|
2827
|
-
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)));
|
|
2828
2714
|
return s;
|
|
2829
2715
|
}, e.maxp = {}, e.maxp.parse = function(r2, t2, a2) {
|
|
2830
2716
|
var n = e._bin, o = {}, s = n.readUint(r2, t2);
|
|
@@ -2848,36 +2734,22 @@ function typrFactory() {
|
|
|
2848
2734
|
var U = n.readUshort(r2, t2);
|
|
2849
2735
|
t2 += 2;
|
|
2850
2736
|
var g, S = h[c], m = d + 12 * s + U;
|
|
2851
|
-
if (0 == u)
|
|
2852
|
-
|
|
2853
|
-
else if (
|
|
2854
|
-
|
|
2855
|
-
else if (
|
|
2856
|
-
g = n.readASCII(r2, m, p);
|
|
2857
|
-
else if (1 == l)
|
|
2858
|
-
g = n.readUnicode(r2, m, p / 2);
|
|
2859
|
-
else if (3 == l)
|
|
2860
|
-
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);
|
|
2861
2742
|
else {
|
|
2862
|
-
if (1 != u)
|
|
2863
|
-
throw "unknown encoding " + l + ", platformID: " + u;
|
|
2743
|
+
if (1 != u) throw "unknown encoding " + l + ", platformID: " + u;
|
|
2864
2744
|
g = n.readASCII(r2, m, p), console.debug("reading unknown MAC encoding " + l + " as ASCII");
|
|
2865
2745
|
}
|
|
2866
2746
|
var b = "p" + u + "," + v.toString(16);
|
|
2867
2747
|
null == o[b] && (o[b] = {}), o[b][void 0 !== S ? S : c] = g, o[b]._lang = v;
|
|
2868
2748
|
}
|
|
2869
|
-
for (var y in o)
|
|
2870
|
-
|
|
2871
|
-
|
|
2872
|
-
for (var y in o)
|
|
2873
|
-
if (null != o[y].postScriptName && 0 == o[y]._lang)
|
|
2874
|
-
return o[y];
|
|
2875
|
-
for (var y in o)
|
|
2876
|
-
if (null != o[y].postScriptName && 3084 == o[y]._lang)
|
|
2877
|
-
return o[y];
|
|
2878
|
-
for (var y in o)
|
|
2879
|
-
if (null != o[y].postScriptName)
|
|
2880
|
-
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];
|
|
2881
2753
|
for (var y in o) {
|
|
2882
2754
|
i = y;
|
|
2883
2755
|
break;
|
|
@@ -2887,15 +2759,11 @@ function typrFactory() {
|
|
|
2887
2759
|
var n = e._bin.readUshort(r2, t2);
|
|
2888
2760
|
t2 += 2;
|
|
2889
2761
|
var o = {};
|
|
2890
|
-
if (0 == n)
|
|
2891
|
-
|
|
2892
|
-
else if (
|
|
2893
|
-
e["OS/2"].version1(r2, t2, o);
|
|
2894
|
-
else if (2 == n || 3 == n || 4 == n)
|
|
2895
|
-
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);
|
|
2896
2765
|
else {
|
|
2897
|
-
if (5 != n)
|
|
2898
|
-
throw "unknown OS/2 table version: " + n;
|
|
2766
|
+
if (5 != n) throw "unknown OS/2 table version: " + n;
|
|
2899
2767
|
e["OS/2"].version5(r2, t2, o);
|
|
2900
2768
|
}
|
|
2901
2769
|
return o;
|
|
@@ -2916,30 +2784,23 @@ function typrFactory() {
|
|
|
2916
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;
|
|
2917
2785
|
}, null == e && (e = {}), null == e.U && (e.U = {}), e.U.codeToGlyph = function(r2, e2) {
|
|
2918
2786
|
var t2 = r2.cmap, a2 = -1;
|
|
2919
|
-
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)
|
|
2920
|
-
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!";
|
|
2921
2788
|
var n = t2.tables[a2];
|
|
2922
|
-
if (0 == n.format)
|
|
2923
|
-
return e2 >= n.map.length ? 0 : n.map[e2];
|
|
2789
|
+
if (0 == n.format) return e2 >= n.map.length ? 0 : n.map[e2];
|
|
2924
2790
|
if (4 == n.format) {
|
|
2925
|
-
for (var o = -1, s = 0; s < n.endCount.length; s++)
|
|
2926
|
-
|
|
2927
|
-
|
|
2928
|
-
|
|
2929
|
-
|
|
2930
|
-
if (
|
|
2931
|
-
return 0;
|
|
2932
|
-
if (n.startCount[o] > e2)
|
|
2933
|
-
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;
|
|
2934
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]);
|
|
2935
2798
|
}
|
|
2936
2799
|
if (12 == n.format) {
|
|
2937
|
-
if (e2 > n.groups[n.groups.length - 1][1])
|
|
2938
|
-
return 0;
|
|
2800
|
+
if (e2 > n.groups[n.groups.length - 1][1]) return 0;
|
|
2939
2801
|
for (s = 0; s < n.groups.length; s++) {
|
|
2940
2802
|
var i = n.groups[s];
|
|
2941
|
-
if (i[0] <= e2 && e2 <= i[1])
|
|
2942
|
-
return i[2] + (e2 - i[0]);
|
|
2803
|
+
if (i[0] <= e2 && e2 <= i[1]) return i[2] + (e2 - i[0]);
|
|
2943
2804
|
}
|
|
2944
2805
|
return 0;
|
|
2945
2806
|
}
|
|
@@ -2953,13 +2814,11 @@ function typrFactory() {
|
|
|
2953
2814
|
if (r2.CFF) {
|
|
2954
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;
|
|
2955
2816
|
if (s.ROS) {
|
|
2956
|
-
for (var h = 0; s.FDSelect[h + 2] <= t2; )
|
|
2957
|
-
h += 2;
|
|
2817
|
+
for (var h = 0; s.FDSelect[h + 2] <= t2; ) h += 2;
|
|
2958
2818
|
i = s.FDArray[s.FDSelect[h + 1]].Private;
|
|
2959
2819
|
}
|
|
2960
2820
|
e.U._drawCFF(r2.CFF.CharStrings[t2], o, s, i, a2);
|
|
2961
|
-
} else
|
|
2962
|
-
r2.glyf && e.U._drawGlyf(t2, r2, a2);
|
|
2821
|
+
} else r2.glyf && e.U._drawGlyf(t2, r2, a2);
|
|
2963
2822
|
return a2;
|
|
2964
2823
|
}, e.U._drawGlyf = function(r2, t2, a2) {
|
|
2965
2824
|
var n = t2.glyf[r2];
|
|
@@ -2968,15 +2827,13 @@ function typrFactory() {
|
|
|
2968
2827
|
for (var a2 = 0; a2 < r2.noc; a2++) {
|
|
2969
2828
|
for (var n = 0 == a2 ? 0 : r2.endPts[a2 - 1] + 1, o = r2.endPts[a2], s = n; s <= o; s++) {
|
|
2970
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];
|
|
2971
|
-
if (s == n)
|
|
2972
|
-
if (
|
|
2973
|
-
|
|
2974
|
-
|
|
2975
|
-
|
|
2976
|
-
|
|
2977
|
-
|
|
2978
|
-
} else
|
|
2979
|
-
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);
|
|
2980
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);
|
|
2981
2838
|
}
|
|
2982
2839
|
e.U.P.closePath(t2);
|
|
@@ -2989,85 +2846,71 @@ function typrFactory() {
|
|
|
2989
2846
|
var d = o.crds[h], f = o.crds[h + 1];
|
|
2990
2847
|
a2.crds.push(d * i.a + f * i.b + i.tx), a2.crds.push(d * i.c + f * i.d + i.ty);
|
|
2991
2848
|
}
|
|
2992
|
-
for (h = 0; h < o.cmds.length; h++)
|
|
2993
|
-
a2.cmds.push(o.cmds[h]);
|
|
2849
|
+
for (h = 0; h < o.cmds.length; h++) a2.cmds.push(o.cmds[h]);
|
|
2994
2850
|
}
|
|
2995
2851
|
}, e.U._getGlyphClass = function(r2, t2) {
|
|
2996
2852
|
var a2 = e._lctf.getInterval(t2, r2);
|
|
2997
2853
|
return -1 == a2 ? 0 : t2[a2 + 2];
|
|
2998
2854
|
}, e.U._applySubs = function(r2, t2, a2, n) {
|
|
2999
|
-
for (var o = r2.length - t2 - 1, s = 0; s < a2.tabs.length; s++)
|
|
3000
|
-
|
|
3001
|
-
|
|
3002
|
-
if (
|
|
3003
|
-
|
|
3004
|
-
|
|
3005
|
-
|
|
3006
|
-
for (var
|
|
3007
|
-
|
|
3008
|
-
|
|
3009
|
-
for (var v = true, c = 0, p = 0; p < l; p++) {
|
|
3010
|
-
for (; -1 == r2[t2 + c + (1 + p)]; )
|
|
3011
|
-
c++;
|
|
3012
|
-
u.chain[p] != r2[t2 + c + (1 + p)] && (v = false);
|
|
3013
|
-
}
|
|
3014
|
-
if (v) {
|
|
3015
|
-
r2[t2] = u.nglyph;
|
|
3016
|
-
for (p = 0; p < l + c; p++)
|
|
3017
|
-
r2[t2 + p + 1] = -1;
|
|
3018
|
-
break;
|
|
3019
|
-
}
|
|
3020
|
-
}
|
|
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);
|
|
3021
2865
|
}
|
|
3022
|
-
|
|
3023
|
-
|
|
3024
|
-
|
|
3025
|
-
|
|
3026
|
-
|
|
3027
|
-
|
|
3028
|
-
|
|
3029
|
-
|
|
3030
|
-
|
|
3031
|
-
|
|
3032
|
-
|
|
3033
|
-
|
|
3034
|
-
|
|
3035
|
-
|
|
3036
|
-
|
|
3037
|
-
}
|
|
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;
|
|
3038
2881
|
}
|
|
3039
2882
|
}
|
|
3040
|
-
|
|
3041
|
-
|
|
3042
|
-
|
|
3043
|
-
if (!e.U._glsCovered(r2, h.inptCvg, t2))
|
|
3044
|
-
continue;
|
|
3045
|
-
if (!e.U._glsCovered(r2, h.ahedCvg, t2 + h.inptCvg.length))
|
|
3046
|
-
continue;
|
|
3047
|
-
var _ = h.lookupRec;
|
|
3048
|
-
for (m = 0; m < _.length; m += 2) {
|
|
3049
|
-
U = _[m];
|
|
3050
|
-
var P = n[_[m + 1]];
|
|
3051
|
-
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];
|
|
3052
2886
|
}
|
|
3053
2887
|
}
|
|
3054
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
|
+
}
|
|
3055
2900
|
}
|
|
2901
|
+
}
|
|
3056
2902
|
}, e.U._glsCovered = function(r2, t2, a2) {
|
|
3057
2903
|
for (var n = 0; n < t2.length; n++) {
|
|
3058
|
-
if (-1 == e._lctf.coverageIndex(t2[n], r2[a2 + n]))
|
|
3059
|
-
return false;
|
|
2904
|
+
if (-1 == e._lctf.coverageIndex(t2[n], r2[a2 + n])) return false;
|
|
3060
2905
|
}
|
|
3061
2906
|
return true;
|
|
3062
2907
|
}, e.U.glyphsToPath = function(r2, t2, a2) {
|
|
3063
2908
|
for (var n = { cmds: [], crds: [] }, o = 0, s = 0; s < t2.length; s++) {
|
|
3064
2909
|
var i = t2[s];
|
|
3065
2910
|
if (-1 != i) {
|
|
3066
|
-
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)
|
|
3067
|
-
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]);
|
|
3068
2912
|
a2 && n.cmds.push(a2);
|
|
3069
|
-
for (f = 0; f < d.cmds.length; f++)
|
|
3070
|
-
n.cmds.push(d.cmds[f]);
|
|
2913
|
+
for (f = 0; f < d.cmds.length; f++) n.cmds.push(d.cmds[f]);
|
|
3071
2914
|
a2 && n.cmds.push("X"), o += r2.hmtx.aWidth[i], s < t2.length - 1 && (o += e.U.getPairAdjustment(r2, i, h));
|
|
3072
2915
|
}
|
|
3073
2916
|
}
|
|
@@ -3086,30 +2929,22 @@ function typrFactory() {
|
|
|
3086
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; ) {
|
|
3087
2930
|
e.CFF.getCharString(r2, u, _);
|
|
3088
2931
|
var P = _.val;
|
|
3089
|
-
if (u += _.size, "o1" == P || "o18" == P)
|
|
3090
|
-
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;
|
|
3091
2933
|
else if ("o3" == P || "o23" == P) {
|
|
3092
2934
|
s.length % 2 != 0 && !h && (d = s.shift() + n.nominalWidthX), i += s.length >> 1, s.length = 0, h = true;
|
|
3093
|
-
} else if ("o4" == P)
|
|
3094
|
-
|
|
3095
|
-
else if ("
|
|
3096
|
-
|
|
3097
|
-
|
|
3098
|
-
|
|
3099
|
-
for (var x = s.length, I = "o6" == P, w = 0; w < x; w++) {
|
|
3100
|
-
var k = s.shift();
|
|
3101
|
-
I ? l += k : v += k, I = !I, e.U.P.lineTo(o, l, v);
|
|
3102
|
-
}
|
|
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
|
+
}
|
|
3103
2941
|
else if ("o8" == P || "o24" == P) {
|
|
3104
2942
|
x = s.length;
|
|
3105
|
-
for (var G = 0; G + 6 <= x; )
|
|
3106
|
-
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;
|
|
3107
2944
|
"o24" == P && (l += s.shift(), v += s.shift(), e.U.P.lineTo(o, l, v));
|
|
3108
2945
|
} else {
|
|
3109
|
-
if ("o11" == P)
|
|
3110
|
-
|
|
3111
|
-
if ("o1234" == P || "o1235" == P || "o1236" == P || "o1237" == P)
|
|
3112
|
-
"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));
|
|
3113
2948
|
else if ("o14" == P) {
|
|
3114
2949
|
if (s.length > 0 && !h && (d = s.shift() + a2.nominalWidthX, h = true), 4 == s.length) {
|
|
3115
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);
|
|
@@ -3118,35 +2953,25 @@ function typrFactory() {
|
|
|
3118
2953
|
f && (e.U.P.closePath(o), f = false);
|
|
3119
2954
|
} else if ("o19" == P || "o20" == P) {
|
|
3120
2955
|
s.length % 2 != 0 && !h && (d = s.shift() + n.nominalWidthX), i += s.length >> 1, s.length = 0, h = true, u += i + 7 >> 3;
|
|
3121
|
-
} else if ("o21" == P)
|
|
3122
|
-
|
|
3123
|
-
else if ("o22" == P)
|
|
3124
|
-
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;
|
|
3125
2958
|
else if ("o25" == P) {
|
|
3126
|
-
for (; s.length > 6; )
|
|
3127
|
-
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);
|
|
3128
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);
|
|
3129
|
-
} else if ("o26" == P)
|
|
3130
|
-
|
|
3131
|
-
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);
|
|
3132
|
-
else if ("o27" == P)
|
|
3133
|
-
for (s.length % 2 && (v += s.shift()); s.length > 0; )
|
|
3134
|
-
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);
|
|
3135
2963
|
else if ("o10" == P || "o29" == P) {
|
|
3136
2964
|
var L = "o10" == P ? n : a2;
|
|
3137
|
-
if (0 == s.length)
|
|
3138
|
-
console.debug("error: empty stack");
|
|
2965
|
+
if (0 == s.length) console.debug("error: empty stack");
|
|
3139
2966
|
else {
|
|
3140
2967
|
var W = s.pop(), M = L.Subrs[W + L.Bias];
|
|
3141
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;
|
|
3142
2969
|
}
|
|
3143
2970
|
} else if ("o30" == P || "o31" == P) {
|
|
3144
2971
|
var V = s.length, E = (G = 0, "o31" == P);
|
|
3145
|
-
for (G += V - (x = -3 & V); G < x; )
|
|
3146
|
-
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;
|
|
3147
2973
|
} else {
|
|
3148
|
-
if ("o" == (P + "").charAt(0))
|
|
3149
|
-
throw console.debug("Unknown operation: " + P, r2), P;
|
|
2974
|
+
if ("o" == (P + "").charAt(0)) throw console.debug("Unknown operation: " + P, r2), P;
|
|
3150
2975
|
s.push(P);
|
|
3151
2976
|
}
|
|
3152
2977
|
}
|
|
@@ -3167,12 +2992,9 @@ Original licenses apply:
|
|
|
3167
2992
|
function woff2otfFactory() {
|
|
3168
2993
|
return function(r) {
|
|
3169
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) {
|
|
3170
|
-
for (var a2 = new n(31), i2 = 0; i2 < 31; ++i2)
|
|
3171
|
-
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];
|
|
3172
2996
|
var o2 = new t(a2[30]);
|
|
3173
|
-
for (i2 = 1; i2 < 30; ++i2)
|
|
3174
|
-
for (var f2 = a2[i2]; f2 < a2[i2 + 1]; ++f2)
|
|
3175
|
-
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;
|
|
3176
2998
|
return [a2, o2];
|
|
3177
2999
|
}, u = f(a, 2), v = u[0], s = u[1];
|
|
3178
3000
|
v[28] = 258, s[258] = 28;
|
|
@@ -3181,37 +3003,24 @@ function woff2otfFactory() {
|
|
|
3181
3003
|
h = (61680 & (h = (52428 & h) >>> 2 | (13107 & h) << 2)) >>> 4 | (3855 & h) << 4, c[g] = ((65280 & h) >>> 8 | (255 & h) << 8) >>> 1;
|
|
3182
3004
|
}
|
|
3183
3005
|
var w = function(r2, e2, t2) {
|
|
3184
|
-
for (var a2 = r2.length, i2 = 0, o2 = new n(e2); i2 < a2; ++i2)
|
|
3185
|
-
++o2[r2[i2] - 1];
|
|
3006
|
+
for (var a2 = r2.length, i2 = 0, o2 = new n(e2); i2 < a2; ++i2) ++o2[r2[i2] - 1];
|
|
3186
3007
|
var f2, u2 = new n(e2);
|
|
3187
|
-
for (i2 = 0; i2 < e2; ++i2)
|
|
3188
|
-
|
|
3189
|
-
if (t2) {
|
|
3008
|
+
for (i2 = 0; i2 < e2; ++i2) u2[i2] = u2[i2 - 1] + o2[i2 - 1] << 1;
|
|
3009
|
+
{
|
|
3190
3010
|
f2 = new n(1 << e2);
|
|
3191
3011
|
var v2 = 15 - e2;
|
|
3192
|
-
for (i2 = 0; i2 < a2; ++i2)
|
|
3193
|
-
|
|
3194
|
-
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)
|
|
3195
|
-
f2[c[g2] >>> v2] = s2;
|
|
3196
|
-
} else
|
|
3197
|
-
for (f2 = new n(a2), i2 = 0; i2 < a2; ++i2)
|
|
3198
|
-
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
|
+
}
|
|
3199
3014
|
return f2;
|
|
3200
3015
|
}, d = new e(288);
|
|
3201
|
-
for (g = 0; g < 144; ++g)
|
|
3202
|
-
|
|
3203
|
-
for (g =
|
|
3204
|
-
|
|
3205
|
-
for (g = 256; g < 280; ++g)
|
|
3206
|
-
d[g] = 7;
|
|
3207
|
-
for (g = 280; g < 288; ++g)
|
|
3208
|
-
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;
|
|
3209
3020
|
var m = new e(32);
|
|
3210
|
-
for (g = 0; g < 32; ++g)
|
|
3211
|
-
|
|
3212
|
-
|
|
3213
|
-
for (var e2 = r2[0], n2 = 1; n2 < r2.length; ++n2)
|
|
3214
|
-
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]);
|
|
3215
3024
|
return e2;
|
|
3216
3025
|
}, L = function(r2, e2, n2) {
|
|
3217
3026
|
var t2 = e2 / 8 | 0;
|
|
@@ -3221,13 +3030,11 @@ function woff2otfFactory() {
|
|
|
3221
3030
|
return (r2[n2] | r2[n2 + 1] << 8 | r2[n2 + 2] << 16) >> (7 & e2);
|
|
3222
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) {
|
|
3223
3032
|
var t2 = new Error(e2 || k[r2]);
|
|
3224
|
-
if (t2.code = r2, Error.captureStackTrace && Error.captureStackTrace(t2, T), !n2)
|
|
3225
|
-
throw t2;
|
|
3033
|
+
if (t2.code = r2, Error.captureStackTrace && Error.captureStackTrace(t2, T), !n2) throw t2;
|
|
3226
3034
|
return t2;
|
|
3227
3035
|
}, O = function(r2, f2, u2) {
|
|
3228
3036
|
var s2 = r2.length;
|
|
3229
|
-
if (!s2 || u2 && !u2.l && s2 < 5)
|
|
3230
|
-
return f2 || new e(0);
|
|
3037
|
+
if (!s2 || u2 && !u2.l && s2 < 5) return f2 || new e(0);
|
|
3231
3038
|
var c2 = !f2 || u2, g2 = !u2 || u2.i;
|
|
3232
3039
|
u2 || (u2 = {}), f2 || (f2 = new e(3 * s2));
|
|
3233
3040
|
var h2, d2 = function(r3) {
|
|
@@ -3250,29 +3057,24 @@ function woff2otfFactory() {
|
|
|
3250
3057
|
c2 && d2(O2 + V), f2.set(r2.subarray(I, _), O2), u2.b = O2 += V, u2.p = k2 = 8 * _;
|
|
3251
3058
|
continue;
|
|
3252
3059
|
}
|
|
3253
|
-
if (1 == S)
|
|
3254
|
-
A2 = b, x2 = p, E = 9, D = 5;
|
|
3060
|
+
if (1 == S) A2 = b, x2 = p, E = 9, D = 5;
|
|
3255
3061
|
else if (2 == S) {
|
|
3256
3062
|
var j = L(r2, k2, 31) + 257, z = L(r2, k2 + 10, 15) + 4, C = j + L(r2, k2 + 5, 31) + 1;
|
|
3257
3063
|
k2 += 14;
|
|
3258
|
-
for (var F = new e(C), P = new e(19), q = 0; q < z; ++q)
|
|
3259
|
-
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);
|
|
3260
3065
|
k2 += 3 * z;
|
|
3261
|
-
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);
|
|
3262
3067
|
for (q = 0; q < C; ) {
|
|
3263
3068
|
var I, J = H[L(r2, k2, G)];
|
|
3264
|
-
if (k2 += 15 & J, (I = J >>> 4) < 16)
|
|
3265
|
-
F[q++] = I;
|
|
3069
|
+
if (k2 += 15 & J, (I = J >>> 4) < 16) F[q++] = I;
|
|
3266
3070
|
else {
|
|
3267
3071
|
var K = 0, N = 0;
|
|
3268
|
-
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--; )
|
|
3269
|
-
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;
|
|
3270
3073
|
}
|
|
3271
3074
|
}
|
|
3272
3075
|
var Q = F.subarray(0, j), R = F.subarray(j);
|
|
3273
|
-
E = y(Q), D = y(R), A2 = w(Q, E
|
|
3274
|
-
} else
|
|
3275
|
-
T(1);
|
|
3076
|
+
E = y(Q), D = y(R), A2 = w(Q, E), x2 = w(R, D);
|
|
3077
|
+
} else T(1);
|
|
3276
3078
|
if (k2 > M) {
|
|
3277
3079
|
g2 && T(0);
|
|
3278
3080
|
break;
|
|
@@ -3285,8 +3087,7 @@ function woff2otfFactory() {
|
|
|
3285
3087
|
g2 && T(0);
|
|
3286
3088
|
break;
|
|
3287
3089
|
}
|
|
3288
|
-
if (K || T(2), Z < 256)
|
|
3289
|
-
f2[O2++] = Z;
|
|
3090
|
+
if (K || T(2), Z < 256) f2[O2++] = Z;
|
|
3290
3091
|
else {
|
|
3291
3092
|
if (256 == Z) {
|
|
3292
3093
|
Y = k2, A2 = null;
|
|
@@ -3309,15 +3110,14 @@ function woff2otfFactory() {
|
|
|
3309
3110
|
break;
|
|
3310
3111
|
}
|
|
3311
3112
|
c2 && d2(O2 + 131072);
|
|
3312
|
-
for (var tr = O2 + $; O2 < tr; O2 += 4)
|
|
3313
|
-
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];
|
|
3314
3114
|
O2 = tr;
|
|
3315
3115
|
}
|
|
3316
3116
|
}
|
|
3317
3117
|
u2.l = A2, u2.p = Y, u2.b = O2, A2 && (m2 = 1, u2.m = E, u2.d = x2, u2.n = D);
|
|
3318
3118
|
} while (!m2);
|
|
3319
3119
|
return O2 == f2.length ? f2 : function(r3, a2, i2) {
|
|
3320
|
-
(null ==
|
|
3120
|
+
(null == i2 || i2 > r3.length) && (i2 = r3.length);
|
|
3321
3121
|
var o2 = new (r3 instanceof n ? n : r3 instanceof t ? t : e)(i2 - a2);
|
|
3322
3122
|
return o2.set(r3.subarray(a2, i2)), o2;
|
|
3323
3123
|
}(f2, 0, O2);
|
|
@@ -3343,11 +3143,9 @@ function woff2otfFactory() {
|
|
|
3343
3143
|
function o2(r3) {
|
|
3344
3144
|
m2.setUint32(b2, r3), b2 += 4;
|
|
3345
3145
|
}
|
|
3346
|
-
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; )
|
|
3347
|
-
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++;
|
|
3348
3147
|
u2--;
|
|
3349
|
-
for (var v2 = 16 * Math.pow(2, u2), s2 = 16 * f2.numTables - v2, l2 = 12, c2 = [], g2 = 0; g2 < f2.numTables; g2++)
|
|
3350
|
-
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;
|
|
3351
3149
|
var h2, w2 = new Uint8Array(12 + 16 * c2.length + c2.reduce(function(r3, e3) {
|
|
3352
3150
|
return r3 + e3.origLength + 4;
|
|
3353
3151
|
}, 0)), d2 = w2.buffer, m2 = new DataView(d2), b2 = 0;
|
|
@@ -3358,8 +3156,7 @@ function woff2otfFactory() {
|
|
|
3358
3156
|
if (e3.compLength != e3.origLength) {
|
|
3359
3157
|
var a3 = new Uint8Array(e3.origLength);
|
|
3360
3158
|
n3 = new Uint8Array(t3, 2), O(n3, a3);
|
|
3361
|
-
} else
|
|
3362
|
-
a3 = new Uint8Array(t3);
|
|
3159
|
+
} else a3 = new Uint8Array(t3);
|
|
3363
3160
|
w2.set(a3, e3.outOffset);
|
|
3364
3161
|
var i3 = 0;
|
|
3365
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;
|
|
@@ -3437,8 +3234,7 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3437
3234
|
prevForm = joiningForms[i] = form;
|
|
3438
3235
|
prevJoiningType = joiningType;
|
|
3439
3236
|
prevIndex = i;
|
|
3440
|
-
if (code > 65535)
|
|
3441
|
-
i++;
|
|
3237
|
+
if (code > 65535) i++;
|
|
3442
3238
|
}
|
|
3443
3239
|
return joiningForms;
|
|
3444
3240
|
}
|
|
@@ -3446,8 +3242,7 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3446
3242
|
const glyphIds = [];
|
|
3447
3243
|
for (let i = 0; i < str.length; i++) {
|
|
3448
3244
|
const cc = str.codePointAt(i);
|
|
3449
|
-
if (cc > 65535)
|
|
3450
|
-
i++;
|
|
3245
|
+
if (cc > 65535) i++;
|
|
3451
3246
|
glyphIds.push(Typr.U.codeToGlyph(font, cc));
|
|
3452
3247
|
}
|
|
3453
3248
|
const gsub = font["GSUB"];
|
|
@@ -3459,8 +3254,7 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3459
3254
|
featureList.forEach((feature) => {
|
|
3460
3255
|
if (supportedFeatures.test(feature.tag)) {
|
|
3461
3256
|
for (let ti = 0; ti < feature.tab.length; ti++) {
|
|
3462
|
-
if (usedLookups[feature.tab[ti]])
|
|
3463
|
-
continue;
|
|
3257
|
+
if (usedLookups[feature.tab[ti]]) continue;
|
|
3464
3258
|
usedLookups[feature.tab[ti]] = true;
|
|
3465
3259
|
const tab = lookupList[feature.tab[ti]];
|
|
3466
3260
|
const isJoiningFeature = /^(isol|init|fina|medi)$/.test(feature.tag);
|
|
@@ -3483,8 +3277,7 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3483
3277
|
let glyphIndex = 0;
|
|
3484
3278
|
for (; glyphIndex < glyphIds.length; glyphIndex++) {
|
|
3485
3279
|
const glyphId = glyphIds[glyphIndex];
|
|
3486
|
-
if (glyphId === -1)
|
|
3487
|
-
continue;
|
|
3280
|
+
if (glyphId === -1) continue;
|
|
3488
3281
|
positions[glyphIndex * 3 + 2] = font.hmtx.aWidth[glyphId];
|
|
3489
3282
|
const gpos = font.GPOS;
|
|
3490
3283
|
if (gpos) {
|
|
@@ -3508,8 +3301,7 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3508
3301
|
if (tab.fmt === 1) {
|
|
3509
3302
|
const right = tab.pairsets[coverageIndex];
|
|
3510
3303
|
for (let k = 0; k < right.length; k++) {
|
|
3511
|
-
if (right[k].gid2 === glyphId)
|
|
3512
|
-
adj = right[k];
|
|
3304
|
+
if (right[k].gid2 === glyphId) adj = right[k];
|
|
3513
3305
|
}
|
|
3514
3306
|
} else if (tab.fmt === 2) {
|
|
3515
3307
|
const c1 = Typr.U._getGlyphClass(glyphIds[prevGlyphIndex], tab.classDef1);
|
|
@@ -3517,10 +3309,8 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3517
3309
|
adj = tab.matrix[c1][c2];
|
|
3518
3310
|
}
|
|
3519
3311
|
if (adj) {
|
|
3520
|
-
if (adj.val1)
|
|
3521
|
-
|
|
3522
|
-
if (adj.val2)
|
|
3523
|
-
applyValueRecord(adj.val2, glyphIndex);
|
|
3312
|
+
if (adj.val1) applyValueRecord(adj.val1, prevGlyphIndex);
|
|
3313
|
+
if (adj.val2) applyValueRecord(adj.val2, glyphIndex);
|
|
3524
3314
|
break;
|
|
3525
3315
|
}
|
|
3526
3316
|
}
|
|
@@ -3644,14 +3434,10 @@ function parserFactory(Typr, woff2otf) {
|
|
|
3644
3434
|
for (let i2 = 0, len = crds.length; i2 < len; i2 += 2) {
|
|
3645
3435
|
let x = crds[i2];
|
|
3646
3436
|
let y = crds[i2 + 1];
|
|
3647
|
-
if (x < xMin)
|
|
3648
|
-
|
|
3649
|
-
if (
|
|
3650
|
-
|
|
3651
|
-
if (x > xMax)
|
|
3652
|
-
xMax = x;
|
|
3653
|
-
if (y > yMax)
|
|
3654
|
-
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;
|
|
3655
3441
|
}
|
|
3656
3442
|
} else {
|
|
3657
3443
|
xMin = xMax = yMin = yMax = 0;
|
|
@@ -3759,8 +3545,7 @@ function unicodeFontResolverClientFactory() {
|
|
|
3759
3545
|
}
|
|
3760
3546
|
function c(t2, n2) {
|
|
3761
3547
|
u(t2, function(t3, r2) {
|
|
3762
|
-
for (var e2 = t3; e2 <= r2; e2++)
|
|
3763
|
-
n2(e2);
|
|
3548
|
+
for (var e2 = t3; e2 <= r2; e2++) n2(e2);
|
|
3764
3549
|
});
|
|
3765
3550
|
}
|
|
3766
3551
|
var s = {}, f = {}, l = /* @__PURE__ */ new WeakMap(), v = "https://cdn.jsdelivr.net/gh/lojjic/unicode-font-resolver@v1.0.1/packages/data";
|
|
@@ -3773,16 +3558,14 @@ function unicodeFontResolverClientFactory() {
|
|
|
3773
3558
|
var h, p = /* @__PURE__ */ new Map();
|
|
3774
3559
|
function g(t2, n2, r2) {
|
|
3775
3560
|
return t2[n2] ? n2 : t2[r2] ? r2 : function(t3) {
|
|
3776
|
-
for (var n3 in t3)
|
|
3777
|
-
return n3;
|
|
3561
|
+
for (var n3 in t3) return n3;
|
|
3778
3562
|
}(t2);
|
|
3779
3563
|
}
|
|
3780
3564
|
function w(t2, n2) {
|
|
3781
3565
|
var r2 = n2;
|
|
3782
3566
|
if (!t2.includes(r2)) {
|
|
3783
3567
|
r2 = 1 / 0;
|
|
3784
|
-
for (var e2 = 0; e2 < t2.length; e2++)
|
|
3785
|
-
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]);
|
|
3786
3569
|
}
|
|
3787
3570
|
return r2;
|
|
3788
3571
|
}
|
|
@@ -3807,16 +3590,13 @@ function unicodeFontResolverClientFactory() {
|
|
|
3807
3590
|
function M(t3) {
|
|
3808
3591
|
var n3 = p.get(t3);
|
|
3809
3592
|
return n3 || (n3 = fetch(l2 + "/" + t3).then(function(t4) {
|
|
3810
|
-
if (!t4.ok)
|
|
3811
|
-
throw new Error(t4.statusText);
|
|
3593
|
+
if (!t4.ok) throw new Error(t4.statusText);
|
|
3812
3594
|
return t4.json().then(function(t5) {
|
|
3813
|
-
if (!Array.isArray(t5) || 1 !== t5[0])
|
|
3814
|
-
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]);
|
|
3815
3596
|
return t5[1];
|
|
3816
3597
|
});
|
|
3817
3598
|
}).catch(function(n4) {
|
|
3818
|
-
if (l2 !== v)
|
|
3819
|
-
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);
|
|
3820
3600
|
throw n4;
|
|
3821
3601
|
}), p.set(t3, n3)), n3;
|
|
3822
3602
|
}
|
|
@@ -3825,8 +3605,7 @@ function unicodeFontResolverClientFactory() {
|
|
|
3825
3605
|
A[n3] = e3, s[e3] || S.has(e3) || S.set(e3, M(e3).then(function(t3) {
|
|
3826
3606
|
s[e3] = t3;
|
|
3827
3607
|
})), r3 > 65535 && (n3++, E = n3);
|
|
3828
|
-
}, E = 0; E < t2.length; E++)
|
|
3829
|
-
P(E);
|
|
3608
|
+
}, E = 0; E < t2.length; E++) P(E);
|
|
3830
3609
|
return Promise.all(S.values()).then(function() {
|
|
3831
3610
|
S.clear();
|
|
3832
3611
|
for (var n3 = function(n4) {
|
|
@@ -3834,36 +3613,30 @@ function unicodeFontResolverClientFactory() {
|
|
|
3834
3613
|
for (var l3 in u3) {
|
|
3835
3614
|
var v2 = m[l3];
|
|
3836
3615
|
if (void 0 === v2 && (v2 = m[l3] = new RegExp(l3).test(e2 || "en")), v2) {
|
|
3837
|
-
for (var d2 in c3 = l3, u3[l3])
|
|
3838
|
-
|
|
3839
|
-
|
|
3840
|
-
|
|
3841
|
-
}
|
|
3616
|
+
for (var d2 in c3 = l3, u3[l3]) if (i(o3, u3[l3][d2])) {
|
|
3617
|
+
a2 = d2;
|
|
3618
|
+
break;
|
|
3619
|
+
}
|
|
3842
3620
|
break;
|
|
3843
3621
|
}
|
|
3844
3622
|
}
|
|
3845
3623
|
if (!a2) {
|
|
3846
|
-
t:
|
|
3847
|
-
for (var
|
|
3848
|
-
|
|
3849
|
-
|
|
3850
|
-
|
|
3851
|
-
|
|
3852
|
-
break t;
|
|
3853
|
-
}
|
|
3854
|
-
}
|
|
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
|
+
}
|
|
3855
3630
|
}
|
|
3856
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) {
|
|
3857
3632
|
f[a2] = t3;
|
|
3858
3633
|
})), o3 > 65535 && (n4++, r3 = n4);
|
|
3859
|
-
}, r3 = 0; r3 < t2.length; r3++)
|
|
3860
|
-
n3(r3);
|
|
3634
|
+
}, r3 = 0; r3 < t2.length; r3++) n3(r3);
|
|
3861
3635
|
return Promise.all(S.values());
|
|
3862
3636
|
}).then(function() {
|
|
3863
3637
|
for (var n3, r3 = null, e3 = 0; e3 < t2.length; e3++) {
|
|
3864
3638
|
var a2 = t2.codePointAt(e3);
|
|
3865
|
-
if (r3 && (k(a2) || d(r3).has(a2)))
|
|
3866
|
-
y[e3] = y[e3 - 1];
|
|
3639
|
+
if (r3 && (k(a2) || d(r3).has(a2))) y[e3] = y[e3 - 1];
|
|
3867
3640
|
else {
|
|
3868
3641
|
r3 = f[A[e3]];
|
|
3869
3642
|
var i2 = b[r3.id];
|
|
@@ -3941,8 +3714,7 @@ function createFontResolver(fontParser, unicodeFontResolverClient) {
|
|
|
3941
3714
|
}
|
|
3942
3715
|
const fontIndices = /* @__PURE__ */ new Map();
|
|
3943
3716
|
const fallbackRanges = [];
|
|
3944
|
-
if (style !== "italic")
|
|
3945
|
-
style = "normal";
|
|
3717
|
+
if (style !== "italic") style = "normal";
|
|
3946
3718
|
if (typeof weight !== "number") {
|
|
3947
3719
|
weight = weight === "bold" ? 700 : 400;
|
|
3948
3720
|
}
|
|
@@ -4267,8 +4039,7 @@ function createTypesetter(resolveFonts, bidi) {
|
|
|
4267
4039
|
isTrailingWhitespace = false;
|
|
4268
4040
|
}
|
|
4269
4041
|
let { lineHeight: lineHeight2, capHeight, xHeight, baseline } = glyphInfo.fontData;
|
|
4270
|
-
if (lineHeight2 > line.lineHeight)
|
|
4271
|
-
line.lineHeight = lineHeight2;
|
|
4042
|
+
if (lineHeight2 > line.lineHeight) line.lineHeight = lineHeight2;
|
|
4272
4043
|
const baselineDiff = baseline - line.baseline;
|
|
4273
4044
|
if (baselineDiff < 0) {
|
|
4274
4045
|
line.baseline += baselineDiff;
|
|
@@ -4436,28 +4207,20 @@ function createTypesetter(resolveFonts, bidi) {
|
|
|
4436
4207
|
const visY0 = glyphY + glyphObj.yMin * fontSizeMult;
|
|
4437
4208
|
const visX1 = glyphX + glyphObj.xMax * fontSizeMult;
|
|
4438
4209
|
const visY1 = glyphY + glyphObj.yMax * fontSizeMult;
|
|
4439
|
-
if (visX0 < visibleBounds[0])
|
|
4440
|
-
|
|
4441
|
-
if (
|
|
4442
|
-
|
|
4443
|
-
if (visX1 > visibleBounds[2])
|
|
4444
|
-
visibleBounds[2] = visX1;
|
|
4445
|
-
if (visY1 > visibleBounds[3])
|
|
4446
|
-
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;
|
|
4447
4214
|
if (idx % chunkedBoundsSize === 0) {
|
|
4448
4215
|
chunk = { start: idx, end: idx, rect: [INF, INF, -INF, -INF] };
|
|
4449
4216
|
chunkedBounds.push(chunk);
|
|
4450
4217
|
}
|
|
4451
4218
|
chunk.end++;
|
|
4452
4219
|
const chunkRect = chunk.rect;
|
|
4453
|
-
if (visX0 < chunkRect[0])
|
|
4454
|
-
|
|
4455
|
-
if (
|
|
4456
|
-
|
|
4457
|
-
if (visX1 > chunkRect[2])
|
|
4458
|
-
chunkRect[2] = visX1;
|
|
4459
|
-
if (visY1 > chunkRect[3])
|
|
4460
|
-
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;
|
|
4461
4224
|
glyphIds[idx] = glyphId;
|
|
4462
4225
|
glyphFontIndices[idx] = fontIndex;
|
|
4463
4226
|
if (colorRanges) {
|
|
@@ -5671,8 +5434,7 @@ class Text extends Mesh {
|
|
|
5671
5434
|
strokeColor = this.strokeColor;
|
|
5672
5435
|
uniforms.uTroikaStrokeColor.value.set(strokeColor == null ? defaultStrokeColor : strokeColor);
|
|
5673
5436
|
strokeOpacity = this.strokeOpacity;
|
|
5674
|
-
if (strokeOpacity == null)
|
|
5675
|
-
strokeOpacity = 1;
|
|
5437
|
+
if (strokeOpacity == null) strokeOpacity = 1;
|
|
5676
5438
|
}
|
|
5677
5439
|
fillOpacity = this.fillOpacity;
|
|
5678
5440
|
}
|
|
@@ -5890,10 +5652,8 @@ function groupCaretsByRow(textRenderInfo) {
|
|
|
5890
5652
|
if (!curRow || top < (curRow.top + curRow.bottom) / 2) {
|
|
5891
5653
|
rows.push(curRow = { bottom, top, carets: [] });
|
|
5892
5654
|
}
|
|
5893
|
-
if (top > curRow.top)
|
|
5894
|
-
|
|
5895
|
-
if (bottom < curRow.bottom)
|
|
5896
|
-
curRow.bottom = bottom;
|
|
5655
|
+
if (top > curRow.top) curRow.top = top;
|
|
5656
|
+
if (bottom < curRow.bottom) curRow.bottom = bottom;
|
|
5897
5657
|
curRow.carets.push({
|
|
5898
5658
|
x,
|
|
5899
5659
|
y: bottom,
|