@ot-builder/io-bin-ttf 1.1.2 → 1.2.0

package/CHANGELOG.json

@@ -2,7 +2,106 @@
   "name": "@ot-builder/io-bin-ttf",
   "entries": [
     {
-      "date": "Sat, 25 Sep 2021 01:06:38 GMT",
+      "date": "Sat, 09 Oct 2021 01:05:28 GMT",
+      "tag": "@ot-builder/io-bin-ttf_v1.2.0",
+      "version": "1.2.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "otbbuilder-dev@users.noreply.github.com",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Add support for VTT private tables",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/bin-util to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/common-impl to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/errors to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/ot-glyphs to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/ot-metadata to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/prelude to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/primitive to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/stat-glyphs to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/var-store to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/variance to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/ot-sfnt to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/io-bin-metadata to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/io-bin-sfnt to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/io-bin-ttf",
+            "comment": "Bump @ot-builder/test-util to v1.2.0",
+            "commit": "cd0361ffd9d2fc5081804b14f9bfddc7fe296008"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 25 Sep 2021 01:08:03 GMT",
       "tag": "@ot-builder/io-bin-ttf_v1.1.2",
       "version": "1.1.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,34 @@
 # Change Log - @ot-builder/io-bin-ttf
 
-This log was last generated on Sat, 25 Sep 2021 01:06:38 GMT and should not be manually modified.
+This log was last generated on Sat, 09 Oct 2021 01:05:28 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.2.0
+
+Sat, 09 Oct 2021 01:05:28 GMT
+
+### Minor changes
+
+- Add support for VTT private tables (otbbuilder-dev@users.noreply.github.com)
+- Bump @ot-builder/bin-util to v1.2.0
+- Bump @ot-builder/common-impl to v1.2.0
+- Bump @ot-builder/errors to v1.2.0
+- Bump @ot-builder/ot-glyphs to v1.2.0
+- Bump @ot-builder/ot-metadata to v1.2.0
+- Bump @ot-builder/prelude to v1.2.0
+- Bump @ot-builder/primitive to v1.2.0
+- Bump @ot-builder/stat-glyphs to v1.2.0
+- Bump @ot-builder/var-store to v1.2.0
+- Bump @ot-builder/variance to v1.2.0
+- Bump @ot-builder/ot-sfnt to v1.2.0
+- Bump @ot-builder/io-bin-metadata to v1.2.0
+- Bump @ot-builder/io-bin-sfnt to v1.2.0
+- Bump @ot-builder/test-util to v1.2.0
+
 ## 1.1.2
 
-Sat, 25 Sep 2021 01:06:38 GMT
+Sat, 25 Sep 2021 01:08:03 GMT
 
 ### Patches
 

package/lib/extra-info-sink/index.d.ts

@@ -0,0 +1,7 @@
+export interface TtfWritingExtraInfoSink {
+    setComponentInfo(glyphID: number, componentID: number, flags: number, targetGID: number, arg1: number, arg2: number, argXScale: number, argScale01: number, argScale10: number, argYScale: number): void;
+}
+export declare class NopTtfWritingExtraInfoSink implements TtfWritingExtraInfoSink {
+    setComponentInfo(): void;
+}
+//# sourceMappingURL=index.d.ts.map

package/lib/extra-info-sink/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NopTtfWritingExtraInfoSink = void 0;
+class NopTtfWritingExtraInfoSink {
+    setComponentInfo() { }
+}
+exports.NopTtfWritingExtraInfoSink = NopTtfWritingExtraInfoSink;
+//# sourceMappingURL=index.js.map

package/lib/glyf/shared.d.ts

@@ -14,7 +14,7 @@ export declare enum ComponentFlag {
     ARGS_ARE_XY_VALUES = 2,
     ROUND_XY_TO_GRID = 4,
     WE_HAVE_A_SCALE = 8,
-    RESERVED = 16,
+    NON_OVERLAPPING = 16,
     MORE_COMPONENTS = 32,
     WE_HAVE_AN_X_AND_Y_SCALE = 64,
     WE_HAVE_A_TWO_BY_TWO = 128,

package/lib/glyf/shared.js

@@ -19,7 +19,7 @@ var ComponentFlag;
     ComponentFlag[ComponentFlag["ARGS_ARE_XY_VALUES"] = 2] = "ARGS_ARE_XY_VALUES";
     ComponentFlag[ComponentFlag["ROUND_XY_TO_GRID"] = 4] = "ROUND_XY_TO_GRID";
     ComponentFlag[ComponentFlag["WE_HAVE_A_SCALE"] = 8] = "WE_HAVE_A_SCALE";
-    ComponentFlag[ComponentFlag["RESERVED"] = 16] = "RESERVED";
+    ComponentFlag[ComponentFlag["NON_OVERLAPPING"] = 16] = "NON_OVERLAPPING";
     ComponentFlag[ComponentFlag["MORE_COMPONENTS"] = 32] = "MORE_COMPONENTS";
     ComponentFlag[ComponentFlag["WE_HAVE_AN_X_AND_Y_SCALE"] = 64] = "WE_HAVE_AN_X_AND_Y_SCALE";
     ComponentFlag[ComponentFlag["WE_HAVE_A_TWO_BY_TWO"] = 128] = "WE_HAVE_A_TWO_BY_TWO";

package/lib/glyf/write.d.ts

@@ -1,6 +1,7 @@
 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]>;
+export declare const GlyfTableWrite: Write<Data.Order<OtGlyph>, [outLoca: LocaTable, stat: OtGlyph.Stat.Sink, extraInfoSink: TtfWritingExtraInfoSink]>;
 //# sourceMappingURL=write.d.ts.map

package/lib/glyf/write.js

@@ -185,7 +185,7 @@ function writeComponentTransform(frag, flag, transform) {
         frag.push(primitive_1.F2D14, transform.yy);
     }
 }
-const CompositeGlyphData = (0, bin_util_1.Write)((frag, cg, gOrd) => {
+const CompositeGlyphData = (0, bin_util_1.Write)((frag, cg, iGlyph, gOrd, extraInfoSink) => {
     const st = cg.getStatData();
     frag.int16(-1)
         .int16(st.extent.xMin)
@@ -201,22 +201,25 @@ const CompositeGlyphData = (0, bin_util_1.Write)((frag, cg, gOrd) => {
             flag |= shared_1.ComponentFlag.MORE_COMPONENTS;
         else if (cg.instructions.byteLength)
             flag |= shared_1.ComponentFlag.WE_HAVE_INSTRUCTIONS;
+        const targetGID = gOrd.reverse(ref.to);
         frag.uint16(flag);
-        frag.uint16(gOrd.reverse(ref.to));
+        frag.uint16(targetGID);
         writeComponentArgs(frag, flag, arg1, arg2);
         writeComponentTransform(frag, flag, ref.transform);
         if (flag & shared_1.ComponentFlag.WE_HAVE_INSTRUCTIONS) {
             frag.uint16(cg.instructions.byteLength);
             frag.bytes(cg.instructions);
         }
+        extraInfoSink.setComponentInfo(iGlyph, rid, flag, targetGID, arg1, arg2, ref.transform.xx, ref.transform.yx, ref.transform.xy, ref.transform.yy);
     }
 });
-exports.GlyfTableWrite = (0, bin_util_1.Write)((frag, gOrd, outLoca, stat) => {
+exports.GlyfTableWrite = (0, bin_util_1.Write)((frag, gOrd, outLoca, stat, extraInfoSink) => {
     const sink = new StdGlyfDataSink(outLoca, frag);
     sink.begin();
     stat.setNumGlyphs(gOrd.length);
     const classifier = new classifier_1.GlyphClassifier(gOrd);
-    for (const glyph of gOrd) {
+    for (let iGlyph = 0; iGlyph < gOrd.length; iGlyph++) {
+        const glyph = gOrd.at(iGlyph);
         const cg = classifier.classify(glyph);
         cg.stat(stat);
         const fGlyph = new bin_util_1.Frag();
@@ -224,7 +227,7 @@ exports.GlyfTableWrite = (0, bin_util_1.Write)((frag, gOrd, outLoca, stat) => {
             fGlyph.push(SimpleGlyphData, cg);
         }
         else if (cg instanceof classifier_1.CompositeGlyph) {
-            fGlyph.push(CompositeGlyphData, cg, gOrd);
+            fGlyph.push(CompositeGlyphData, cg, iGlyph, gOrd, extraInfoSink);
         }
         sink.add(fGlyph);
     }

package/lib/index.d.ts

@@ -2,8 +2,10 @@ import { LocaTable } from "./glyf/loca";
 export * from "./cvt/index";
 export * from "./cvar/index";
 export * from "./fpgm-prep/index";
-export * from "./cfg";
+export * from "./cfg/index";
+export * from "./extra-info-sink/index";
 export * from "./rectify/rectify";
+export * from "./glyf/shared";
 export declare namespace Loca {
     type Table = LocaTable;
     const Tag = "loca";
@@ -15,11 +17,11 @@ 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]>;
+    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]>;
 }
 export declare namespace Gvar {
     const Tag = "gvar";
-    const Read: import("@ot-builder/bin-util").Read<void, [gOrd: import("@ot-builder/prelude/lib/data").Order<import("@ot-builder/ot-glyphs").OtGlyph>, cfg: import("./cfg").TtfCfg, ignore: import("./gvar/read").GvarReadIgnore, designSpace: import("@ot-builder/variance/lib/otvar-impl").DesignSpace]>;
-    const Write: import("@ot-builder/bin-util").Write<import("@ot-builder/prelude/lib/data").Order<import("@ot-builder/ot-glyphs").OtGlyph>, [cfg: import("./cfg").TtfCfg, designSpace: import("@ot-builder/variance/lib/otvar-impl").DesignSpace, acEmpty?: import("@ot-builder/common-impl").Access<boolean> | undefined]>;
+    const Read: import("@ot-builder/bin-util").Read<void, [gOrd: import("@ot-builder/prelude/lib/data").Order<import("@ot-builder/ot-glyphs").OtGlyph>, cfg: import("./cfg/index").TtfCfg, ignore: import("./gvar/read").GvarReadIgnore, designSpace: import("@ot-builder/variance/lib/otvar-impl").DesignSpace]>;
+    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, designSpace: import("@ot-builder/variance/lib/otvar-impl").DesignSpace, acEmpty?: import("@ot-builder/common-impl").Access<boolean> | undefined]>;
 }
 //# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -12,8 +12,10 @@ const write_2 = require("./gvar/write");
 (0, tslib_1.__exportStar)(require("./cvt/index"), exports);
 (0, tslib_1.__exportStar)(require("./cvar/index"), exports);
 (0, tslib_1.__exportStar)(require("./fpgm-prep/index"), exports);
-(0, tslib_1.__exportStar)(require("./cfg"), exports);
+(0, tslib_1.__exportStar)(require("./cfg/index"), exports);
+(0, tslib_1.__exportStar)(require("./extra-info-sink/index"), exports);
 (0, tslib_1.__exportStar)(require("./rectify/rectify"), exports);
+(0, tslib_1.__exportStar)(require("./glyf/shared"), exports);
 var Loca;
 (function (Loca) {
     Loca.Tag = loca_1.LocaTag;

package/package.json

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