diff --git a/pitfall/fontkit/GPOS-test.rkt b/pitfall/fontkit/GPOS-test.rkt index 708b6937..741ef9a4 100644 --- a/pitfall/fontkit/GPOS-test.rkt +++ b/pitfall/fontkit/GPOS-test.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require fontkit rackunit restructure racket/serialize) +(require fontkit rackunit xenomorph racket/serialize) (define fira-path "../pitfall/test/assets/fira.ttf") (define f (openSync fira-path)) diff --git a/pitfall/fontkit/GPOS.rkt b/pitfall/fontkit/GPOS.rkt index e72b1914..91305940 100644 --- a/pitfall/fontkit/GPOS.rkt +++ b/pitfall/fontkit/GPOS.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure br/cond "opentype.rkt") +(require xenomorph br/cond "opentype.rkt") (provide (all-defined-out)) #| diff --git a/pitfall/fontkit/OS2.rkt b/pitfall/fontkit/OS2.rkt index 3eb73cf8..65b6cedd 100644 --- a/pitfall/fontkit/OS2.rkt +++ b/pitfall/fontkit/OS2.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| diff --git a/pitfall/fontkit/cvt_.rkt b/pitfall/fontkit/cvt_.rkt index 9ee26eb1..9f966a79 100644 --- a/pitfall/fontkit/cvt_.rkt +++ b/pitfall/fontkit/cvt_.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| approximates diff --git a/pitfall/fontkit/directory.rkt b/pitfall/fontkit/directory.rkt index 3f2547e1..b1c8924c 100644 --- a/pitfall/fontkit/directory.rkt +++ b/pitfall/fontkit/directory.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure "tables.rkt") +(require xenomorph "tables.rkt") (provide (all-defined-out)) diff --git a/pitfall/fontkit/font.rkt b/pitfall/fontkit/font.rkt index e9f8360b..6c0a1247 100644 --- a/pitfall/fontkit/font.rkt +++ b/pitfall/fontkit/font.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require "freetype-ffi.rkt" ffi/unsafe racket/runtime-path "subset.rkt" "glyph.rkt" "layout-engine.rkt" "bbox.rkt" "glyphrun.rkt" "cmap-processor.rkt" "directory.rkt" restructure "tables.rkt" "ttfglyph.rkt") +(require "freetype-ffi.rkt" ffi/unsafe racket/runtime-path "subset.rkt" "glyph.rkt" "layout-engine.rkt" "bbox.rkt" "glyphrun.rkt" "cmap-processor.rkt" "directory.rkt" xenomorph "tables.rkt" "ttfglyph.rkt") (provide (all-defined-out)) #| diff --git a/pitfall/fontkit/fpgm.rkt b/pitfall/fontkit/fpgm.rkt index ba6c8b82..b63d42a7 100644 --- a/pitfall/fontkit/fpgm.rkt +++ b/pitfall/fontkit/fpgm.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| approximates diff --git a/pitfall/fontkit/glyf.rkt b/pitfall/fontkit/glyf.rkt index e993f398..dd06cf46 100644 --- a/pitfall/fontkit/glyf.rkt +++ b/pitfall/fontkit/glyf.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| approximates diff --git a/pitfall/fontkit/head.rkt b/pitfall/fontkit/head.rkt index 1fc96a6f..39687940 100644 --- a/pitfall/fontkit/head.rkt +++ b/pitfall/fontkit/head.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| diff --git a/pitfall/fontkit/hhea.rkt b/pitfall/fontkit/hhea.rkt index 9cf16bf8..cc584250 100644 --- a/pitfall/fontkit/hhea.rkt +++ b/pitfall/fontkit/hhea.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) (define-subclass Struct (Rhhea)) diff --git a/pitfall/fontkit/hmtx.rkt b/pitfall/fontkit/hmtx.rkt index dae90bc0..dda6e77a 100644 --- a/pitfall/fontkit/hmtx.rkt +++ b/pitfall/fontkit/hmtx.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| approximates diff --git a/pitfall/fontkit/loca.rkt b/pitfall/fontkit/loca.rkt index 51b44c7f..8e8f7882 100644 --- a/pitfall/fontkit/loca.rkt +++ b/pitfall/fontkit/loca.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) (define 16bit-style 0) @@ -13,7 +13,7 @@ https://github.com/mbutterick/fontkit/blob/master/src/tables/loca.js (define-subclass VersionedStruct (Rloca) (define/augride (process res stream ctx) - ;; in `restructure` `process` method, `res` is aliased as `this` + ;; in `xenomorph` `process` method, `res` is aliased as `this` ;; (when (= 16bit-style (ยท res version)) ;; in a 16bits-style loca table, actual 32bit offset values are divided by 2 (to fit into 16 bits) diff --git a/pitfall/fontkit/maxp.rkt b/pitfall/fontkit/maxp.rkt index 03f2e68a..6fbef939 100644 --- a/pitfall/fontkit/maxp.rkt +++ b/pitfall/fontkit/maxp.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) (define-subclass Struct (Rmaxp)) diff --git a/pitfall/fontkit/opentype.rkt b/pitfall/fontkit/opentype.rkt index af48d237..fa96abf3 100644 --- a/pitfall/fontkit/opentype.rkt +++ b/pitfall/fontkit/opentype.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| diff --git a/pitfall/fontkit/post.rkt b/pitfall/fontkit/post.rkt index 3e40eac1..557936ec 100644 --- a/pitfall/fontkit/post.rkt +++ b/pitfall/fontkit/post.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| diff --git a/pitfall/fontkit/prep.rkt b/pitfall/fontkit/prep.rkt index 553f907a..1edf6f28 100644 --- a/pitfall/fontkit/prep.rkt +++ b/pitfall/fontkit/prep.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require restructure) +(require xenomorph) (provide (all-defined-out)) #| approximates diff --git a/pitfall/fontkit/subset.rkt b/pitfall/fontkit/subset.rkt index 76a36f9b..1ca41ef2 100644 --- a/pitfall/fontkit/subset.rkt +++ b/pitfall/fontkit/subset.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require "clone.rkt" "ttfglyphencoder.rkt" "loca.rkt" "directory.rkt" restructure) +(require "clone.rkt" "ttfglyphencoder.rkt" "loca.rkt" "directory.rkt" xenomorph) (provide Subset CFFSubset TTFSubset) #| diff --git a/pitfall/fontkit/ttfglyph.rkt b/pitfall/fontkit/ttfglyph.rkt index 485a7fc2..ad2f3f18 100644 --- a/pitfall/fontkit/ttfglyph.rkt +++ b/pitfall/fontkit/ttfglyph.rkt @@ -1,5 +1,5 @@ #lang fontkit/racket -(require "glyph.rkt" restructure) +(require "glyph.rkt" xenomorph) (provide (all-defined-out)) #| approximates diff --git a/pitfall/info.rkt b/pitfall/info.rkt index b6dc412b..09044cca 100644 --- a/pitfall/info.rkt +++ b/pitfall/info.rkt @@ -4,3 +4,4 @@ (define build-deps '("scribble-lib" "racket-doc")) (define version "0.0") (define pkg-authors '(mb)) +(define compile-omit-paths '("pitfall/test/node_modules/pdfkit")) \ No newline at end of file diff --git a/pitfall/restructure/test/racket.rkt b/pitfall/restructure/test/racket.rkt deleted file mode 100644 index 7efec920..00000000 --- a/pitfall/restructure/test/racket.rkt +++ /dev/null @@ -1,6 +0,0 @@ -#lang racket/base -(require rackunit restructure "../private/racket.rkt") -(provide (all-from-out rackunit restructure "../private/racket.rkt")) - -(module reader syntax/module-reader - #:language 'restructure/test/racket) \ No newline at end of file diff --git a/pitfall/restructure/array.rkt b/pitfall/xenomorph/array.rkt similarity index 100% rename from pitfall/restructure/array.rkt rename to pitfall/xenomorph/array.rkt diff --git a/pitfall/restructure/bitfield.rkt b/pitfall/xenomorph/bitfield.rkt similarity index 100% rename from pitfall/restructure/bitfield.rkt rename to pitfall/xenomorph/bitfield.rkt diff --git a/pitfall/restructure/buffer.rkt b/pitfall/xenomorph/buffer.rkt similarity index 100% rename from pitfall/restructure/buffer.rkt rename to pitfall/xenomorph/buffer.rkt diff --git a/pitfall/restructure/enum.rkt b/pitfall/xenomorph/enum.rkt similarity index 100% rename from pitfall/restructure/enum.rkt rename to pitfall/xenomorph/enum.rkt diff --git a/pitfall/restructure/lazy-array.rkt b/pitfall/xenomorph/lazy-array.rkt similarity index 100% rename from pitfall/restructure/lazy-array.rkt rename to pitfall/xenomorph/lazy-array.rkt diff --git a/pitfall/restructure/main.rkt b/pitfall/xenomorph/main.rkt similarity index 100% rename from pitfall/restructure/main.rkt rename to pitfall/xenomorph/main.rkt diff --git a/pitfall/restructure/number.rkt b/pitfall/xenomorph/number.rkt similarity index 100% rename from pitfall/restructure/number.rkt rename to pitfall/xenomorph/number.rkt diff --git a/pitfall/restructure/optional.rkt b/pitfall/xenomorph/optional.rkt similarity index 100% rename from pitfall/restructure/optional.rkt rename to pitfall/xenomorph/optional.rkt diff --git a/pitfall/restructure/pointer.rkt b/pitfall/xenomorph/pointer.rkt similarity index 100% rename from pitfall/restructure/pointer.rkt rename to pitfall/xenomorph/pointer.rkt diff --git a/pitfall/restructure/private/array.rkt b/pitfall/xenomorph/private/array.rkt similarity index 100% rename from pitfall/restructure/private/array.rkt rename to pitfall/xenomorph/private/array.rkt diff --git a/pitfall/restructure/private/base.rkt b/pitfall/xenomorph/private/base.rkt similarity index 100% rename from pitfall/restructure/private/base.rkt rename to pitfall/xenomorph/private/base.rkt diff --git a/pitfall/restructure/private/bitfield.rkt b/pitfall/xenomorph/private/bitfield.rkt similarity index 100% rename from pitfall/restructure/private/bitfield.rkt rename to pitfall/xenomorph/private/bitfield.rkt diff --git a/pitfall/restructure/private/buffer.rkt b/pitfall/xenomorph/private/buffer.rkt similarity index 100% rename from pitfall/restructure/private/buffer.rkt rename to pitfall/xenomorph/private/buffer.rkt diff --git a/pitfall/restructure/private/enum.rkt b/pitfall/xenomorph/private/enum.rkt similarity index 100% rename from pitfall/restructure/private/enum.rkt rename to pitfall/xenomorph/private/enum.rkt diff --git a/pitfall/restructure/private/generic.rkt b/pitfall/xenomorph/private/generic.rkt similarity index 100% rename from pitfall/restructure/private/generic.rkt rename to pitfall/xenomorph/private/generic.rkt diff --git a/pitfall/restructure/private/helper.rkt b/pitfall/xenomorph/private/helper.rkt similarity index 100% rename from pitfall/restructure/private/helper.rkt rename to pitfall/xenomorph/private/helper.rkt diff --git a/pitfall/restructure/private/lazy-array.rkt b/pitfall/xenomorph/private/lazy-array.rkt similarity index 100% rename from pitfall/restructure/private/lazy-array.rkt rename to pitfall/xenomorph/private/lazy-array.rkt diff --git a/pitfall/restructure/private/number.rkt b/pitfall/xenomorph/private/number.rkt similarity index 100% rename from pitfall/restructure/private/number.rkt rename to pitfall/xenomorph/private/number.rkt diff --git a/pitfall/restructure/private/optional.rkt b/pitfall/xenomorph/private/optional.rkt similarity index 100% rename from pitfall/restructure/private/optional.rkt rename to pitfall/xenomorph/private/optional.rkt diff --git a/pitfall/restructure/private/pointer.rkt b/pitfall/xenomorph/private/pointer.rkt similarity index 100% rename from pitfall/restructure/private/pointer.rkt rename to pitfall/xenomorph/private/pointer.rkt diff --git a/pitfall/restructure/private/racket.rkt b/pitfall/xenomorph/private/racket.rkt similarity index 93% rename from pitfall/restructure/private/racket.rkt rename to pitfall/xenomorph/private/racket.rkt index e8a2ee81..d7a6bd3d 100644 --- a/pitfall/restructure/private/racket.rkt +++ b/pitfall/xenomorph/private/racket.rkt @@ -24,4 +24,4 @@ (module reader syntax/module-reader - #:language 'restructure/private/racket) \ No newline at end of file + #:language 'xenomorph/private/racket) \ No newline at end of file diff --git a/pitfall/restructure/private/reserved.rkt b/pitfall/xenomorph/private/reserved.rkt similarity index 100% rename from pitfall/restructure/private/reserved.rkt rename to pitfall/xenomorph/private/reserved.rkt diff --git a/pitfall/restructure/private/sizes.rkt b/pitfall/xenomorph/private/sizes.rkt similarity index 100% rename from pitfall/restructure/private/sizes.rkt rename to pitfall/xenomorph/private/sizes.rkt diff --git a/pitfall/restructure/private/stream.rkt b/pitfall/xenomorph/private/stream.rkt similarity index 100% rename from pitfall/restructure/private/stream.rkt rename to pitfall/xenomorph/private/stream.rkt diff --git a/pitfall/restructure/private/string.rkt b/pitfall/xenomorph/private/string.rkt similarity index 100% rename from pitfall/restructure/private/string.rkt rename to pitfall/xenomorph/private/string.rkt diff --git a/pitfall/restructure/private/struct.rkt b/pitfall/xenomorph/private/struct.rkt similarity index 100% rename from pitfall/restructure/private/struct.rkt rename to pitfall/xenomorph/private/struct.rkt diff --git a/pitfall/restructure/private/utils.rkt b/pitfall/xenomorph/private/utils.rkt similarity index 100% rename from pitfall/restructure/private/utils.rkt rename to pitfall/xenomorph/private/utils.rkt diff --git a/pitfall/restructure/private/versioned-struct.rkt b/pitfall/xenomorph/private/versioned-struct.rkt similarity index 100% rename from pitfall/restructure/private/versioned-struct.rkt rename to pitfall/xenomorph/private/versioned-struct.rkt diff --git a/pitfall/restructure/reserved.rkt b/pitfall/xenomorph/reserved.rkt similarity index 100% rename from pitfall/restructure/reserved.rkt rename to pitfall/xenomorph/reserved.rkt diff --git a/pitfall/restructure/stream.rkt b/pitfall/xenomorph/stream.rkt similarity index 100% rename from pitfall/restructure/stream.rkt rename to pitfall/xenomorph/stream.rkt diff --git a/pitfall/restructure/string.rkt b/pitfall/xenomorph/string.rkt similarity index 100% rename from pitfall/restructure/string.rkt rename to pitfall/xenomorph/string.rkt diff --git a/pitfall/restructure/struct.rkt b/pitfall/xenomorph/struct.rkt similarity index 100% rename from pitfall/restructure/struct.rkt rename to pitfall/xenomorph/struct.rkt diff --git a/pitfall/restructure/test/array-test.rkt b/pitfall/xenomorph/test/array-test.rkt similarity index 100% rename from pitfall/restructure/test/array-test.rkt rename to pitfall/xenomorph/test/array-test.rkt diff --git a/pitfall/restructure/test/bitfield-test.rkt b/pitfall/xenomorph/test/bitfield-test.rkt similarity index 100% rename from pitfall/restructure/test/bitfield-test.rkt rename to pitfall/xenomorph/test/bitfield-test.rkt diff --git a/pitfall/restructure/test/buffer-test.rkt b/pitfall/xenomorph/test/buffer-test.rkt similarity index 100% rename from pitfall/restructure/test/buffer-test.rkt rename to pitfall/xenomorph/test/buffer-test.rkt diff --git a/pitfall/restructure/test/enum-test.rkt b/pitfall/xenomorph/test/enum-test.rkt similarity index 100% rename from pitfall/restructure/test/enum-test.rkt rename to pitfall/xenomorph/test/enum-test.rkt diff --git a/pitfall/restructure/test/lazy-array-test.rkt b/pitfall/xenomorph/test/lazy-array-test.rkt similarity index 100% rename from pitfall/restructure/test/lazy-array-test.rkt rename to pitfall/xenomorph/test/lazy-array-test.rkt diff --git a/pitfall/restructure/test/main.rkt b/pitfall/xenomorph/test/main.rkt similarity index 100% rename from pitfall/restructure/test/main.rkt rename to pitfall/xenomorph/test/main.rkt diff --git a/pitfall/restructure/test/number-test.rkt b/pitfall/xenomorph/test/number-test.rkt similarity index 100% rename from pitfall/restructure/test/number-test.rkt rename to pitfall/xenomorph/test/number-test.rkt diff --git a/pitfall/restructure/test/optional-test.rkt b/pitfall/xenomorph/test/optional-test.rkt similarity index 100% rename from pitfall/restructure/test/optional-test.rkt rename to pitfall/xenomorph/test/optional-test.rkt diff --git a/pitfall/restructure/test/pointer-test.rkt b/pitfall/xenomorph/test/pointer-test.rkt similarity index 100% rename from pitfall/restructure/test/pointer-test.rkt rename to pitfall/xenomorph/test/pointer-test.rkt diff --git a/pitfall/xenomorph/test/racket.rkt b/pitfall/xenomorph/test/racket.rkt new file mode 100644 index 00000000..f62f3b37 --- /dev/null +++ b/pitfall/xenomorph/test/racket.rkt @@ -0,0 +1,6 @@ +#lang racket/base +(require rackunit xenomorph "../private/racket.rkt") +(provide (all-from-out rackunit xenomorph "../private/racket.rkt")) + +(module reader syntax/module-reader + #:language 'xenomorph/test/racket) \ No newline at end of file diff --git a/pitfall/restructure/test/reserved-test.rkt b/pitfall/xenomorph/test/reserved-test.rkt similarity index 100% rename from pitfall/restructure/test/reserved-test.rkt rename to pitfall/xenomorph/test/reserved-test.rkt diff --git a/pitfall/restructure/test/stream-test.rkt b/pitfall/xenomorph/test/stream-test.rkt similarity index 100% rename from pitfall/restructure/test/stream-test.rkt rename to pitfall/xenomorph/test/stream-test.rkt diff --git a/pitfall/restructure/test/string-test.rkt b/pitfall/xenomorph/test/string-test.rkt similarity index 100% rename from pitfall/restructure/test/string-test.rkt rename to pitfall/xenomorph/test/string-test.rkt diff --git a/pitfall/restructure/test/struct-test.rkt b/pitfall/xenomorph/test/struct-test.rkt similarity index 100% rename from pitfall/restructure/test/struct-test.rkt rename to pitfall/xenomorph/test/struct-test.rkt diff --git a/pitfall/restructure/test/test.rkt b/pitfall/xenomorph/test/test.rkt similarity index 100% rename from pitfall/restructure/test/test.rkt rename to pitfall/xenomorph/test/test.rkt diff --git a/pitfall/restructure/test/versioned-struct-test.rkt b/pitfall/xenomorph/test/versioned-struct-test.rkt similarity index 100% rename from pitfall/restructure/test/versioned-struct-test.rkt rename to pitfall/xenomorph/test/versioned-struct-test.rkt diff --git a/pitfall/restructure/versioned-struct.rkt b/pitfall/xenomorph/versioned-struct.rkt similarity index 100% rename from pitfall/restructure/versioned-struct.rkt rename to pitfall/xenomorph/versioned-struct.rkt