@ot-builder/io-bin-ttf 1.7.8 → 1.9.0

package/lib/cfg/index.d.ts

@@ -1,4 +1,5 @@
 export interface TtfCfgProps {
+    glyfIncludeOverlapSimpleFlag?: boolean;
     gvarOptimizeTolerance?: number;
     gvarForceProduceGVD?: boolean;
     gvarForceZeroGapsBetweenGVD?: boolean;

package/lib/cfg/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultTtfCfgProps = void 0;
 exports.DefaultTtfCfgProps = {
+    glyfIncludeOverlapSimpleFlag: true,
     gvarOptimizeTolerance: 1 / 128,
     gvarForceProduceGVD: false,
     gvarForceZeroGapsBetweenGVD: false,

package/lib/cvar/index.d.ts

@@ -1,6 +1,6 @@
-import { BinaryView, Frag } from "@ot-builder/bin-util";
-import * as ImpLib from "@ot-builder/common-impl";
-import { Cvt } from "@ot-builder/ot-glyphs";
+import type { BinaryView, Frag } from "@ot-builder/bin-util";
+import type * as ImpLib from "@ot-builder/common-impl";
+import type { Cvt } from "@ot-builder/ot-glyphs";
 import { OtVar } from "@ot-builder/variance";
 export declare const CvarIo: {
     read(view: BinaryView, cvt: Cvt.Table, designSpace: OtVar.DesignSpace): void;

package/lib/cvt/index.d.ts

@@ -1,4 +1,4 @@
-import { BinaryView, Frag } from "@ot-builder/bin-util";
+import type { BinaryView, Frag } from "@ot-builder/bin-util";
 import { Cvt } from "@ot-builder/ot-glyphs";
 export declare const CvtIo: {
     read(view: BinaryView): Cvt.Table;

package/lib/fpgm-prep/index.d.ts

@@ -1,4 +1,4 @@
-import { BinaryView, Frag } from "@ot-builder/bin-util";
+import type { BinaryView, Frag } from "@ot-builder/bin-util";
 import { Fpgm, Prep } from "@ot-builder/ot-glyphs";
 export declare const FpgmIo: {
     read(view: BinaryView): Fpgm.Table;

package/lib/glyf/classifier.d.ts

@@ -1,5 +1,5 @@
 import { OtGlyph } from "@ot-builder/ot-glyphs";
-import { Data } from "@ot-builder/prelude";
+import type { Data } from "@ot-builder/prelude";
 export declare class GlyphClassifier {
     private gOrd;
     constructor(gOrd: Data.Order<OtGlyph>);

package/lib/glyf/loca.d.ts

@@ -1,5 +1,5 @@
-import { BinaryView, Frag } from "@ot-builder/bin-util";
-import { Head, Maxp } from "@ot-builder/ot-metadata";
+import type { BinaryView, Frag } from "@ot-builder/bin-util";
+import type { Head, Maxp } from "@ot-builder/ot-metadata";
 export declare const LocaTag = "loca";
 export interface LocaTable {
     glyphOffsets: number[];

package/lib/glyf/read.d.ts

@@ -1,6 +1,6 @@
 import { Read } from "@ot-builder/bin-util";
 import { OtGlyph } from "@ot-builder/ot-glyphs";
-import { Data } from "@ot-builder/prelude";
-import { LocaTable } from "./loca";
+import type { Data } from "@ot-builder/prelude";
+import type { LocaTable } from "./loca";
 export declare const GlyfTableRead: Read<void, [loca: LocaTable, gOrd: Data.Order<OtGlyph>, coStat: OtGlyph.CoStat.Source]>;
 //# sourceMappingURL=read.d.ts.map

package/lib/glyf/read.js

@@ -178,6 +178,7 @@ const CompositeGlyph = (0, bin_util_1.Read)((view, gOrd) => {
     return { references, instructions };
 });
 exports.GlyfTableRead = (0, bin_util_1.Read)((view, loca, gOrd, coStat) => {
+    var _a;
     for (let gid = 0; gid < gOrd.length; gid++) {
         const glyph = gOrd.at(gid);
         const offset = loca.glyphOffsets[gid];
@@ -193,14 +194,14 @@ exports.GlyfTableRead = (0, bin_util_1.Read)((view, loca, gOrd, coStat) => {
             if (numberOfContours >= 0) {
                 const { geometry, instructions } = vGlyph.next(SimpleGlyph, numberOfContours);
                 glyph.geometry = geometry;
-                if (instructions && instructions.byteLength) {
+                if (instructions.byteLength) {
                     glyph.hints = new ot_glyphs_1.OtGlyph.TtInstruction(instructions);
                 }
             }
             else {
                 const r = vGlyph.next(CompositeGlyph, gOrd);
                 glyph.geometry = new ot_glyphs_1.OtGlyph.GeometryList(r.references);
-                if (r.instructions && r.instructions.byteLength) {
+                if ((_a = r.instructions) === null || _a === void 0 ? void 0 : _a.byteLength) {
                     glyph.hints = new ot_glyphs_1.OtGlyph.TtInstruction(r.instructions);
                 }
             }

package/lib/glyf/write.d.ts

@@ -1,7 +1,8 @@
 import { Write } from "@ot-builder/bin-util";
 import { OtGlyph } from "@ot-builder/ot-glyphs";
-import { Data } from "@ot-builder/prelude";
-import { TtfWritingExtraInfoSink } from "../extra-info-sink/index";
-import { LocaTable } from "./loca";
-export declare const GlyfTableWrite: Write<Data.Order<OtGlyph>, [outLoca: LocaTable, stat: OtGlyph.Stat.Sink, extraInfoSink: TtfWritingExtraInfoSink]>;
+import type { Data } from "@ot-builder/prelude";
+import type { TtfCfg } from "../cfg";
+import type { TtfWritingExtraInfoSink } from "../extra-info-sink/index";
+import type { LocaTable } from "./loca";
+export declare const GlyfTableWrite: Write<Data.Order<OtGlyph>, [cfg: TtfCfg, outLoca: LocaTable, stat: OtGlyph.Stat.Sink, extraInfoSink: TtfWritingExtraInfoSink]>;
 //# sourceMappingURL=write.d.ts.map

package/lib/glyf/write.js

@@ -1,15 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlyfTableWrite = void 0;
+const tslib_1 = require("tslib");
 const bin_util_1 = require("@ot-builder/bin-util");
-const ImpLib = require("@ot-builder/common-impl");
+const ImpLib = tslib_1.__importStar(require("@ot-builder/common-impl"));
 const ot_glyphs_1 = require("@ot-builder/ot-glyphs");
 const primitive_1 = require("@ot-builder/primitive");
 const variance_1 = require("@ot-builder/variance");
 const classifier_1 = require("./classifier");
 const shared_1 = require("./shared");
 class FlagShrinker {
-    constructor() {
+    constructor(cfg) {
+        this.cfg = cfg;
         this.flags = [];
         this.repeating = 0;
         this.last = 0;
@@ -42,8 +44,7 @@ class FlagShrinker {
         this.count++;
     }
     finalizeAndGetFlags() {
-        // Always set overlapping flag
-        if (this.flags.length) {
+        if (this.cfg.ttf.glyfIncludeOverlapSimpleFlag && this.flags.length) {
             this.flags[0] |= shared_1.SimpleGlyphFlag.OVERLAP_SIMPLE;
         }
         return this.flags;
@@ -68,10 +69,10 @@ class FlagShrinker {
     }
 }
 // TODO: could we optimize MORE?
-function collectSimpleGlyphOutlineData(sg) {
+function collectSimpleGlyphOutlineData(sg, cfg) {
     let endPtsOfContours = -1;
     const endPtsOfContoursArray = [];
-    const shrinker = new FlagShrinker();
+    const shrinker = new FlagShrinker(cfg);
     const fragX = new bin_util_1.Frag();
     const fragY = new bin_util_1.Frag();
     let cx = 0, cy = 0;
@@ -93,14 +94,14 @@ function collectSimpleGlyphOutlineData(sg) {
     }
     return { flags: shrinker.finalizeAndGetFlags(), fragX, fragY, endPtsOfContoursArray };
 }
-const SimpleGlyphData = (0, bin_util_1.Write)((frag, sg) => {
+const SimpleGlyphData = (0, bin_util_1.Write)((frag, sg, cfg) => {
     const st = sg.getStatData();
     frag.int16(st.eigenContours)
         .int16(st.extent.xMin)
         .int16(st.extent.yMin)
         .int16(st.extent.xMax)
         .int16(st.extent.yMax);
-    const analysis = collectSimpleGlyphOutlineData(sg);
+    const analysis = collectSimpleGlyphOutlineData(sg, cfg);
     for (const zid of analysis.endPtsOfContoursArray)
         frag.uint16(zid);
     frag.uint16(sg.instructions.byteLength);
@@ -217,7 +218,7 @@ const CompositeGlyphData = (0, bin_util_1.Write)((frag, cg, iGlyph, gOrd, extraI
         );
     }
 });
-exports.GlyfTableWrite = (0, bin_util_1.Write)((frag, gOrd, outLoca, stat, extraInfoSink) => {
+exports.GlyfTableWrite = (0, bin_util_1.Write)((frag, gOrd, cfg, outLoca, stat, extraInfoSink) => {
     const sink = new StdGlyfDataSink(outLoca, frag);
     sink.begin();
     stat.setNumGlyphs(gOrd.length);
@@ -228,7 +229,7 @@ exports.GlyfTableWrite = (0, bin_util_1.Write)((frag, gOrd, outLoca, stat, extra
         cg.stat(stat);
         const fGlyph = new bin_util_1.Frag();
         if (cg instanceof classifier_1.SimpleGlyph) {
-            fGlyph.push(SimpleGlyphData, cg);
+            fGlyph.push(SimpleGlyphData, cg, cfg);
         }
         else if (cg instanceof classifier_1.CompositeGlyph) {
             fGlyph.push(CompositeGlyphData, cg, iGlyph, gOrd, extraInfoSink);

package/lib/gvar/read.d.ts

@@ -1,8 +1,8 @@
 import { Read } from "@ot-builder/bin-util";
 import { OtGlyph } from "@ot-builder/ot-glyphs";
-import { Data } from "@ot-builder/prelude";
+import type { Data } from "@ot-builder/prelude";
 import { OtVar } from "@ot-builder/variance";
-import { TtfCfg } from "../cfg";
+import type { TtfCfg } from "../cfg";
 export interface GvarReadIgnore {
     horizontalMetric?: boolean;
     verticalMetric?: boolean;

package/lib/gvar/write.d.ts

@@ -1,8 +1,8 @@
 import { Write } from "@ot-builder/bin-util";
-import * as ImpLib from "@ot-builder/common-impl";
+import type * as ImpLib from "@ot-builder/common-impl";
 import { OtGlyph } from "@ot-builder/ot-glyphs";
-import { Data } from "@ot-builder/prelude";
-import { OtVar } from "@ot-builder/variance";
-import { TtfCfg } from "../cfg";
+import type { Data } from "@ot-builder/prelude";
+import type { OtVar } from "@ot-builder/variance";
+import type { TtfCfg } from "../cfg";
 export declare const GvarTableWrite: Write<Data.Order<OtGlyph>, [cfg: TtfCfg, designSpace: OtVar.DesignSpace, acEmpty?: ImpLib.Access<boolean> | undefined]>;
 //# sourceMappingURL=write.d.ts.map

package/lib/index.d.ts

@@ -1,11 +1,11 @@
-import { LocaTable } from "./glyf/loca";
-export * from "./cvt/index";
-export * from "./cvar/index";
-export * from "./fpgm-prep/index";
+import { type LocaTable } from "./glyf/loca";
 export * from "./cfg/index";
+export * from "./cvar/index";
+export * from "./cvt/index";
 export * from "./extra-info-sink/index";
-export * from "./rectify/rectify";
+export * from "./fpgm-prep/index";
 export * from "./glyf/shared";
+export * from "./rectify/rectify";
 export declare namespace Loca {
     type Table = LocaTable;
     const Tag = "loca";
@@ -17,7 +17,7 @@ export declare namespace Loca {
 export declare namespace Glyf {
     const Tag = "glyf";
     const Read: import("@ot-builder/bin-util").Read<void, [loca: LocaTable, gOrd: import("@ot-builder/prelude/lib/data").Order<import("@ot-builder/ot-glyphs").OtGlyph>, coStat: import("@ot-builder/ot-glyphs/lib/ot-glyph/co-stat").Source]>;
-    const Write: import("@ot-builder/bin-util").Write<import("@ot-builder/prelude/lib/data").Order<import("@ot-builder/ot-glyphs").OtGlyph>, [outLoca: LocaTable, stat: import("@ot-builder/ot-glyphs/lib/ot-glyph/stat").Sink, extraInfoSink: import("./extra-info-sink/index").TtfWritingExtraInfoSink]>;
+    const Write: import("@ot-builder/bin-util").Write<import("@ot-builder/prelude/lib/data").Order<import("@ot-builder/ot-glyphs").OtGlyph>, [cfg: import("./cfg/index").TtfCfg, outLoca: LocaTable, stat: import("@ot-builder/ot-glyphs/lib/ot-glyph/stat").Sink, extraInfoSink: import("./extra-info-sink/index").TtfWritingExtraInfoSink]>;
 }
 export declare namespace Gvar {
     const Tag = "gvar";

package/lib/index.js

@@ -9,13 +9,13 @@ const write_1 = require("./glyf/write");
 const read_2 = require("./gvar/read");
 const shared_2 = require("./gvar/shared");
 const write_2 = require("./gvar/write");
-tslib_1.__exportStar(require("./cvt/index"), exports);
-tslib_1.__exportStar(require("./cvar/index"), exports);
-tslib_1.__exportStar(require("./fpgm-prep/index"), exports);
 tslib_1.__exportStar(require("./cfg/index"), exports);
+tslib_1.__exportStar(require("./cvar/index"), exports);
+tslib_1.__exportStar(require("./cvt/index"), exports);
 tslib_1.__exportStar(require("./extra-info-sink/index"), exports);
-tslib_1.__exportStar(require("./rectify/rectify"), exports);
+tslib_1.__exportStar(require("./fpgm-prep/index"), exports);
 tslib_1.__exportStar(require("./glyf/shared"), exports);
+tslib_1.__exportStar(require("./rectify/rectify"), exports);
 var Loca;
 (function (Loca) {
     Loca.Tag = loca_1.LocaTag;

package/lib/rectify/rectify.d.ts

@@ -1,4 +1,4 @@
 import { OtGlyph } from "@ot-builder/ot-glyphs";
-import { Data } from "@ot-builder/prelude";
+import type { Data } from "@ot-builder/prelude";
 export declare function rectifyGlyphOrder(gOrd: Data.Order<OtGlyph>): void;
 //# sourceMappingURL=rectify.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ot-builder/io-bin-ttf",
   "description": "",
-  "version": "1.7.8",
+  "version": "1.9.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,23 +24,23 @@
     "access": "public"
   },
   "dependencies": {
-    "@ot-builder/bin-util": "1.7.8",
-    "@ot-builder/common-impl": "1.7.7",
-    "@ot-builder/errors": "1.7.7",
-    "@ot-builder/ot-glyphs": "1.7.8",
-    "@ot-builder/ot-metadata": "1.7.8",
-    "@ot-builder/prelude": "1.7.7",
-    "@ot-builder/primitive": "1.7.8",
-    "@ot-builder/stat-glyphs": "1.7.8",
-    "@ot-builder/var-store": "1.7.8",
-    "@ot-builder/variance": "1.7.8",
+    "@ot-builder/bin-util": "1.8.0",
+    "@ot-builder/common-impl": "1.8.0",
+    "@ot-builder/errors": "1.8.0",
+    "@ot-builder/ot-glyphs": "1.8.0",
+    "@ot-builder/ot-metadata": "1.8.0",
+    "@ot-builder/prelude": "1.8.0",
+    "@ot-builder/primitive": "1.8.0",
+    "@ot-builder/stat-glyphs": "1.8.0",
+    "@ot-builder/var-store": "1.8.0",
+    "@ot-builder/variance": "1.8.0",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@ot-builder/ot-sfnt": "1.7.8",
-    "@ot-builder/io-bin-metadata": "1.7.8",
-    "@ot-builder/io-bin-sfnt": "1.7.8",
-    "@ot-builder/test-util": "1.7.8",
+    "@ot-builder/ot-sfnt": "1.8.0",
+    "@ot-builder/io-bin-metadata": "1.8.0",
+    "@ot-builder/io-bin-sfnt": "1.8.0",
+    "@ot-builder/test-util": "1.8.0",
     "@types/jest": "^30.0.0",
     "jest": "^30.2.0"
   }