Point to @pdf-lib/* dependencies

package.json

@@ -24,16 +24,16 @@
     "layout"
   ],
   "dependencies": {
+    "@pdf-lib/brotli": "^0.0.0",
+    "@pdf-lib/restructure": "^0.0.0",
+    "@pdf-lib/unicode-properties": "^0.0.0",
     "base64-arraybuffer": "^0.1.5",
-    "brotli": "git+https://github.com/Hopding/brotli.js.git#2a623817f6bd8d1f7f528f69ac8ce8067b3383fb",
     "clone": "^1.0.1",
     "deep-equal": "^1.0.0",
     "dfa": "^1.0.0",
     "iconv-lite": "^0.4.13",
     "pako": "^1.0.6",
-    "restructure": "git+https://github.com/Hopding/restructure.git#6f9fd535c3914685a55002ef9b48e08a684b9bec",
     "tiny-inflate": "^1.0.2",
-    "unicode-properties": "git+https://github.com/Hopding/unicode-properties.git#51a63d54730b78507206f07d19bd04186e5cffe7",
     "unicode-trie": "^0.3.0"
   },
   "devDependencies": {

src/DFont.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import TTFFont from './TTFFont';
 
 let DFontName = new r.String(r.uint8);

src/TTFFont.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import { cache } from './decorators';
 import fontkit from './base';
 import Directory from './tables/directory';

src/TrueTypeCollection.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import TTFFont from './TTFFont';
 import Directory from './tables/directory';
 import tables from './tables';

src/WOFF2Font.js

@@ -1,5 +1,5 @@
-import r from 'restructure';
-import brotli from 'brotli/decompress';
+import r from '@pdf-lib/restructure';
+import brotli from '@pdf-lib/brotli/decompress';
 import TTFFont from './TTFFont';
 import TTFGlyph, { Point } from './glyph/TTFGlyph';
 import WOFF2Glyph from './glyph/WOFF2Glyph';

src/WOFFFont.js

@@ -2,7 +2,7 @@ import TTFFont from './TTFFont';
 import WOFFDirectory from './tables/WOFFDirectory';
 import tables from './tables';
 import inflate from 'tiny-inflate';
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 export default class WOFFFont extends TTFFont {
   static probe(buffer) {

src/base.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 const formats = [];
 

src/cff/CFFDict.js

@@ -1,7 +1,7 @@
 import isEqual from 'deep-equal';
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import CFFOperand from './CFFOperand';
-import { PropertyDescriptor } from 'restructure/src/utils';
+import { PropertyDescriptor } from '@pdf-lib/restructure/src/utils';
 
 export default class CFFDict {
   constructor(ops = []) {

src/cff/CFFFont.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import CFFIndex from './CFFIndex';
 import CFFTop from './CFFTop';
 import CFFPrivateDict from './CFFPrivateDict';

src/cff/CFFIndex.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 export default class CFFIndex {
   constructor(type) {

src/cff/CFFPointer.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 export default class CFFPointer extends r.Pointer {
   constructor(type, options = {}) {

src/cff/CFFTop.js

@@ -1,5 +1,5 @@
-import r from 'restructure';
-import { resolveLength } from 'restructure/src/utils';
+import r from '@pdf-lib/restructure';
+import { resolveLength } from '@pdf-lib/restructure/src/utils';
 import CFFDict from './CFFDict';
 import CFFIndex from './CFFIndex';
 import CFFPointer from './CFFPointer';

src/glyph/Glyph.js

@@ -1,6 +1,6 @@
 import { cache } from '../decorators';
 import Path from './Path';
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 import StandardNames from './StandardNames';
 
 /**

src/glyph/SBIXGlyph.js

@@ -1,5 +1,5 @@
 import TTFGlyph from './TTFGlyph';
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let SBIXImage = new r.Struct({
   originX: r.uint16,

src/glyph/TTFGlyph.js

@@ -1,7 +1,7 @@
 import Glyph from './Glyph';
 import Path from './Path';
 import BBox from './BBox';
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // The header for both simple and composite glyphs
 let GlyfHeader = new r.Struct({

src/glyph/TTFGlyphEncoder.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // Flags for simple glyphs
 const ON_CURVE        = 1 << 0;

src/layout/LayoutEngine.js

@@ -3,7 +3,7 @@ import UnicodeLayoutEngine from './UnicodeLayoutEngine';
 import GlyphRun from './GlyphRun';
 import GlyphPosition from './GlyphPosition';
 import * as Script from './Script';
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 import AATLayoutEngine from '../aat/AATLayoutEngine';
 import OTLayoutEngine from '../opentype/OTLayoutEngine';
 

src/layout/Script.js

@@ -1,4 +1,4 @@
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 
 // This maps the Unicode Script property to an OpenType script tag
 // Data from http://www.microsoft.com/typography/otspec/scripttags.htm

src/layout/UnicodeLayoutEngine.js

@@ -1,4 +1,4 @@
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 
 /**
  * This class is used when GPOS does not define 'mark' or 'mkmk' features

src/opentype/GlyphInfo.js

@@ -1,4 +1,4 @@
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 import OTProcessor from './OTProcessor';
 
 export default class GlyphInfo {

src/opentype/shapers/ArabicShaper.js

@@ -1,5 +1,5 @@
 import DefaultShaper from './DefaultShaper';
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 import UnicodeTrie from 'unicode-trie';
 import pako from 'pako';
 import * as base64 from 'base64-arraybuffer';

src/opentype/shapers/DefaultShaper.js

@@ -1,4 +1,4 @@
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 
 const VARIATION_FEATURES = ['rvrn'];
 const COMMON_FEATURES = ['ccmp', 'locl', 'rlig', 'mark', 'mkmk'];

src/opentype/shapers/IndicShaper.js

@@ -1,7 +1,7 @@
 import DefaultShaper from './DefaultShaper';
 import StateMachine from 'dfa';
 import UnicodeTrie from 'unicode-trie';
-import unicode from 'unicode-properties';
+import unicode from '@pdf-lib/unicode-properties';
 import pako from 'pako';
 import * as base64 from 'base64-arraybuffer';
 import * as Script from '../../layout/Script';

src/subset/Subset.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 export default class Subset {
   constructor(font) {

src/tables/BASE.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import {ScriptList, FeatureList, LookupList, Coverage, ClassDef, Device} from './opentype';
 import {ItemVariationStore} from './variations';
 

src/tables/COLR.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let LayerRecord = new r.Struct({
   gid: r.uint16,          // Glyph ID of layer glyph (must be in z-order from bottom to top).

src/tables/CPAL.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let ColorRecord = new r.Struct({
   blue: r.uint8,

src/tables/DSIG.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let Signature = new r.Struct({
   format: r.uint32,

src/tables/EBDT.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 export let BigMetrics = new r.Struct({
   height: r.uint8,

src/tables/EBLC.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import {BigMetrics} from './EBDT';
 
 let SBitLineMetrics = new r.Struct({

src/tables/GDEF.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import {ScriptList, FeatureList, LookupList, Coverage, ClassDef, Device} from './opentype';
 import {ItemVariationStore} from './variations';
 

src/tables/GPOS.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import {ScriptList, FeatureList, LookupList, Coverage, ClassDef, Device, Context, ChainingContext} from './opentype';
 import {FeatureVariations} from './variations';
 

src/tables/GSUB.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import {ScriptList, FeatureList, LookupList, Coverage, ClassDef, Device, Context, ChainingContext} from './opentype';
 import {FeatureVariations} from './variations';
 

src/tables/HVAR.js

@@ -1,5 +1,5 @@
-import r from 'restructure';
-import {resolveLength} from 'restructure/src/utils';
+import r from '@pdf-lib/restructure';
+import {resolveLength} from '@pdf-lib/restructure/src/utils';
 import {ItemVariationStore} from './variations';
 
 // TODO: add this to restructure

src/tables/JSTF.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import { ScriptList, FeatureList, LookupList, Coverage, ClassDef, Device } from './opentype';
 import { GPOSLookup } from './GPOS';
 

src/tables/LTSH.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // Linear Threshold table
 // Records the ppem for each glyph at which the scaling becomes linear again,

src/tables/OS2.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 var OS2 = new r.VersionedStruct(r.uint16, {
   header: {

src/tables/PCLT.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // PCL 5 Table
 // NOTE: The PCLT table is strongly discouraged for OpenType fonts with TrueType outlines

src/tables/VDMX.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // VDMX tables contain ascender/descender overrides for certain (usually small)
 // sizes. This is needed in order to match font metrics on Windows.

src/tables/VORG.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let VerticalOrigin = new r.Struct({
   glyphIndex:   r.uint16,

src/tables/WOFF2Directory.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 const Base128 = {
   decode(stream) {

src/tables/WOFFDirectory.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import tables from './';
 
 let WOFFDirectoryEntry = new r.Struct({

src/tables/aat.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 class UnboundedArrayAccessor {
   constructor(type, stream, parent) {

src/tables/avar.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let shortFrac = new r.Fixed(16, 'BE', 14);
 

src/tables/bsln.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import { LookupTable } from './aat';
 
 let BslnSubtable = new r.VersionedStruct('format', {

src/tables/cmap.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let SubHeader = new r.Struct({
   firstCode:      r.uint16,

src/tables/cvt.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // An array of predefined values accessible by instructions
 export default new r.Struct({

src/tables/directory.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import Tables from './';
 
 let TableEntry = new r.Struct({

src/tables/feat.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let Setting = new r.Struct({
   setting: r.uint16,

src/tables/fpgm.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // A list of instructions that are executed once when a font is first used.
 // These instructions are known as the font program. The main use of this table

src/tables/fvar.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let Axis = new r.Struct({
   axisTag: new r.String(4),

src/tables/gasp.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let GaspRange = new r.Struct({
   rangeMaxPPEM:       r.uint16,                  // Upper limit of range, in ppem

src/tables/glyf.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // only used for encoding
 export default new r.Array(new r.Buffer);

src/tables/gvar.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let shortFrac = new r.Fixed(16, 'BE', 14);
 class Offset {

src/tables/hdmx.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let DeviceRecord = new r.Struct({
   pixelSize:      r.uint8,

src/tables/head.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // font header
 export default new r.Struct({

src/tables/hhea.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 // horizontal header
 export default new r.Struct({

src/tables/hmtx.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let HmtxEntry = new r.Struct({
   advance: r.uint16,

src/tables/just.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 import { LookupTable, StateTable1 } from './aat';
 
 let ClassTable = new r.Struct({

src/tables/kern.js

@@ -1,4 +1,4 @@
-import r from 'restructure';
+import r from '@pdf-lib/restructure';
 
 let KernPair = new r.Struct({
   left:   r.uint16,