diff --git a/fontland/fontland/CFF2.rkt b/fontland/fontland/CFF2.rkt index 8b4491f4..f48c0374 100644 --- a/fontland/fontland/CFF2.rkt +++ b/fontland/fontland/CFF2.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "CFF_.rkt") (provide (rename-out [CFF_ CFF2])) diff --git a/fontland/fontland/CFF_.rkt b/fontland/fontland/CFF_.rkt index 7af25bfd..f49569f8 100644 --- a/fontland/fontland/CFF_.rkt +++ b/fontland/fontland/CFF_.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide CFF_) #| diff --git a/fontland/fontland/GPOS-test.rkt b/fontland/fontland/GPOS-test.rkt index 2c9fac2b..66ed77b4 100644 --- a/fontland/fontland/GPOS-test.rkt +++ b/fontland/fontland/GPOS-test.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require fontkit fontkit/gpos-processor "subset.rkt" rackunit xenomorph racket/serialize) (define fira-path "../pitfall/test/assets/fira.ttf") diff --git a/fontland/fontland/GPOS.rkt b/fontland/fontland/GPOS.rkt index cbfdffea..bf6a849d 100644 --- a/fontland/fontland/GPOS.rkt +++ b/fontland/fontland/GPOS.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph br/cond "opentype.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/GSUB.rkt b/fontland/fontland/GSUB.rkt index 51a2cccd..80406d02 100644 --- a/fontland/fontland/GSUB.rkt +++ b/fontland/fontland/GSUB.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph br/cond "opentype.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/OS2.rkt b/fontland/fontland/OS2.rkt index 0a561e9e..15d50252 100644 --- a/fontland/fontland/OS2.rkt +++ b/fontland/fontland/OS2.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/assets/charter-italic.ttf b/fontland/fontland/assets/charter-italic.ttf new file mode 100644 index 00000000..a6501214 Binary files /dev/null and b/fontland/fontland/assets/charter-italic.ttf differ diff --git a/fontland/fontland/assets/charter.otf b/fontland/fontland/assets/charter.otf new file mode 100644 index 00000000..d2314d35 Binary files /dev/null and b/fontland/fontland/assets/charter.otf differ diff --git a/fontland/fontland/assets/charter.ttf b/fontland/fontland/assets/charter.ttf new file mode 100644 index 00000000..33c6d7cb Binary files /dev/null and b/fontland/fontland/assets/charter.ttf differ diff --git a/fontland/fontland/assets/fira.otf b/fontland/fontland/assets/fira.otf new file mode 100644 index 00000000..20bc9a19 Binary files /dev/null and b/fontland/fontland/assets/fira.otf differ diff --git a/fontland/fontland/assets/fira.ttf b/fontland/fontland/assets/fira.ttf new file mode 100644 index 00000000..4834eede Binary files /dev/null and b/fontland/fontland/assets/fira.ttf differ diff --git a/fontland/fontland/bbox.rkt b/fontland/fontland/bbox.rkt index 8ebde8a5..ef3b0217 100644 --- a/fontland/fontland/bbox.rkt +++ b/fontland/fontland/bbox.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide BBox bbox->list) (define-subclass object% (BBox diff --git a/fontland/fontland/clone.rkt b/fontland/fontland/clone.rkt index ffcad17f..0a6d5ec1 100644 --- a/fontland/fontland/clone.rkt +++ b/fontland/fontland/clone.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require racket/serialize) (provide cloneDeep) diff --git a/fontland/fontland/cmap-processor.rkt b/fontland/fontland/cmap-processor.rkt index d56bbba6..ef59c59f 100644 --- a/fontland/fontland/cmap-processor.rkt +++ b/fontland/fontland/cmap-processor.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide CmapProcessor) (define-subclass object% (CmapProcessor cmapTable) diff --git a/fontland/fontland/cvt_.rkt b/fontland/fontland/cvt_.rkt index 6e89c377..d76630d9 100644 --- a/fontland/fontland/cvt_.rkt +++ b/fontland/fontland/cvt_.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) #| diff --git a/fontland/fontland/default-shaper.rkt b/fontland/fontland/default-shaper.rkt index 8c3f8211..f6aebd7c 100644 --- a/fontland/fontland/default-shaper.rkt +++ b/fontland/fontland/default-shaper.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide (all-defined-out)) (define VARIATION_FEATURES '(rvrn)) diff --git a/fontland/fontland/directory.rkt b/fontland/fontland/directory.rkt index b8906d1d..38dc8e80 100644 --- a/fontland/fontland/directory.rkt +++ b/fontland/fontland/directory.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph "tables.rkt" describe) (provide (all-defined-out)) diff --git a/fontland/fontland/fpgm.rkt b/fontland/fontland/fpgm.rkt index 14ceaa15..ae090670 100644 --- a/fontland/fontland/fpgm.rkt +++ b/fontland/fontland/fpgm.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) #| diff --git a/fontland/fontland/glyf.rkt b/fontland/fontland/glyf.rkt index 5962f694..3b5a1ea4 100644 --- a/fontland/fontland/glyf.rkt +++ b/fontland/fontland/glyf.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) #| diff --git a/fontland/fontland/glyph-iterator.rkt b/fontland/fontland/glyph-iterator.rkt index 2153e6cb..82044e4e 100644 --- a/fontland/fontland/glyph-iterator.rkt +++ b/fontland/fontland/glyph-iterator.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require br/cond) (provide (all-defined-out)) diff --git a/fontland/fontland/glyph-position.rkt b/fontland/fontland/glyph-position.rkt index 16b07f29..fc7b63fc 100644 --- a/fontland/fontland/glyph-position.rkt +++ b/fontland/fontland/glyph-position.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide (all-defined-out)) ;; Represents positioning information for a glyph in a GlyphRun. diff --git a/fontland/fontland/glyph.rkt b/fontland/fontland/glyph.rkt index 577e7457..10b21ac8 100644 --- a/fontland/fontland/glyph.rkt +++ b/fontland/fontland/glyph.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "freetype-ffi.rkt") (provide (all-defined-out)) (module+ test (require rackunit)) diff --git a/fontland/fontland/glyphinfo.rkt b/fontland/fontland/glyphinfo.rkt index 1aabd39b..efa505e9 100644 --- a/fontland/fontland/glyphinfo.rkt +++ b/fontland/fontland/glyphinfo.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "ot-processor.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/glyphrun.rkt b/fontland/fontland/glyphrun.rkt index f943fb63..14e9e777 100644 --- a/fontland/fontland/glyphrun.rkt +++ b/fontland/fontland/glyphrun.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "bbox.rkt" (prefix-in Script- "script.rkt")) (provide (all-defined-out)) diff --git a/fontland/fontland/gpos-processor-test.rkt b/fontland/fontland/gpos-processor-test.rkt index fc6b14f0..308899cd 100644 --- a/fontland/fontland/gpos-processor-test.rkt +++ b/fontland/fontland/gpos-processor-test.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require fontkit "gpos-processor.rkt" rackunit xenomorph racket/serialize describe) (define fira-path "../pitfall/test/assets/fira.ttf") diff --git a/fontland/fontland/gpos-processor.rkt b/fontland/fontland/gpos-processor.rkt index 86039048..186815a6 100644 --- a/fontland/fontland/gpos-processor.rkt +++ b/fontland/fontland/gpos-processor.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "ot-processor.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/gsub-processor-test.rkt b/fontland/fontland/gsub-processor-test.rkt index edf40732..dd9c5d00 100644 --- a/fontland/fontland/gsub-processor-test.rkt +++ b/fontland/fontland/gsub-processor-test.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require fontkit "gsub-processor.rkt" rackunit xenomorph racket/serialize describe) (define fira-path "../pitfall/test/assets/fira.ttf") diff --git a/fontland/fontland/gsub-processor.rkt b/fontland/fontland/gsub-processor.rkt index 51fffe09..330fd4a7 100644 --- a/fontland/fontland/gsub-processor.rkt +++ b/fontland/fontland/gsub-processor.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "ot-processor.rkt" "glyphinfo.rkt" br/cond) (provide (all-defined-out)) diff --git a/fontland/fontland/head.rkt b/fontland/fontland/head.rkt index 0bfa792b..f714161b 100644 --- a/fontland/fontland/head.rkt +++ b/fontland/fontland/head.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/helper.rkt b/fontland/fontland/helper.rkt index 6eb307d9..da0123ab 100644 --- a/fontland/fontland/helper.rkt +++ b/fontland/fontland/helper.rkt @@ -4,10 +4,10 @@ (define index? (λ (x) (and (number? x) (integer? x) (not (negative? x))))) -(define-runtime-path charter-path "../ptest/assets/charter.ttf") -(define-runtime-path charter-italic-path "../ptest/assets/charter-italic.ttf") -(define-runtime-path fira-path "../ptest/assets/fira.ttf") -(define-runtime-path fira-otf-path "../ptest/assets/fira.otf") +(define-runtime-path charter-path "assets/charter.ttf") +(define-runtime-path charter-italic-path "assets/charter-italic.ttf") +(define-runtime-path fira-path "assets/fira.ttf") +(define-runtime-path fira-otf-path "assets/fira.otf") (define-runtime-path charter-directory-path "charter-directory.rktd") (define-runtime-path charter-italic-directory-path "charter-italic-directory.rktd") diff --git a/fontland/fontland/hhea.rkt b/fontland/fontland/hhea.rkt index 20692420..9f91da13 100644 --- a/fontland/fontland/hhea.rkt +++ b/fontland/fontland/hhea.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/hmtx.rkt b/fontland/fontland/hmtx.rkt index 6e711222..057d27c9 100644 --- a/fontland/fontland/hmtx.rkt +++ b/fontland/fontland/hmtx.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) #| diff --git a/fontland/fontland/layout-engine.rkt b/fontland/fontland/layout-engine.rkt index 5ff00d9b..1fd57a4c 100644 --- a/fontland/fontland/layout-engine.rkt +++ b/fontland/fontland/layout-engine.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require (prefix-in Script- "script.rkt") "glyph.rkt" "glyphrun.rkt" "glyph-position.rkt" "ot-layout-engine.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/loca.rkt b/fontland/fontland/loca.rkt index af80b8ac..3b24ab4a 100644 --- a/fontland/fontland/loca.rkt +++ b/fontland/fontland/loca.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/main.rkt b/fontland/fontland/main.rkt index 81aae8b7..fc80ba4d 100644 --- a/fontland/fontland/main.rkt +++ b/fontland/fontland/main.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (r+p "font.rkt" "glyph-position.rkt" diff --git a/fontland/fontland/maxp.rkt b/fontland/fontland/maxp.rkt index da8501ae..d8abab86 100644 --- a/fontland/fontland/maxp.rkt +++ b/fontland/fontland/maxp.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/opentype.rkt b/fontland/fontland/opentype.rkt index b55366cb..cc7962f7 100644 --- a/fontland/fontland/opentype.rkt +++ b/fontland/fontland/opentype.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/ot-layout-engine.rkt b/fontland/fontland/ot-layout-engine.rkt index 4dd373de..52180821 100644 --- a/fontland/fontland/ot-layout-engine.rkt +++ b/fontland/fontland/ot-layout-engine.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "gsub-processor.rkt" "gpos-processor.rkt" "glyphinfo.rkt" (prefix-in Shapers- "shapers.rkt") "shaping-plan.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/ot-processor.rkt b/fontland/fontland/ot-processor.rkt index 6b77d3b7..ca933284 100644 --- a/fontland/fontland/ot-processor.rkt +++ b/fontland/fontland/ot-processor.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require (prefix-in Script- "script.rkt") br/cond "glyph-iterator.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/post.rkt b/fontland/fontland/post.rkt index eb06270b..4ee760d9 100644 --- a/fontland/fontland/post.rkt +++ b/fontland/fontland/post.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) diff --git a/fontland/fontland/prep.rkt b/fontland/fontland/prep.rkt index c3d224b7..3a3d5c77 100644 --- a/fontland/fontland/prep.rkt +++ b/fontland/fontland/prep.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require xenomorph) (provide (all-defined-out)) #| diff --git a/fontland/fontland/racket.rkt b/fontland/fontland/racket.rkt index 9eadbe77..911a652b 100644 --- a/fontland/fontland/racket.rkt +++ b/fontland/fontland/racket.rkt @@ -18,12 +18,12 @@ racket/port racket/function br/define - sugar/class - sugar/js - sugar/dict - sugar/stub - sugar/port - sugar/contract + sugar/unstable/class + sugar/unstable/js + sugar/unstable/dict + sugar/unstable/stub + sugar/unstable/port + sugar/unstable/contract describe) diff --git a/fontland/fontland/script.rkt b/fontland/fontland/script.rkt index 7da1b071..ade700e4 100644 --- a/fontland/fontland/script.rkt +++ b/fontland/fontland/script.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide (all-defined-out)) #| diff --git a/fontland/fontland/shapers.rkt b/fontland/fontland/shapers.rkt index 9f4e8cc8..cd45d8b3 100644 --- a/fontland/fontland/shapers.rkt +++ b/fontland/fontland/shapers.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "default-shaper.rkt") (provide (all-defined-out)) diff --git a/fontland/fontland/shaping-plan.rkt b/fontland/fontland/shaping-plan.rkt index 914bac68..798f442e 100644 --- a/fontland/fontland/shaping-plan.rkt +++ b/fontland/fontland/shaping-plan.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require (prefix-in Script- "script.rkt")) (provide (all-defined-out)) diff --git a/fontland/fontland/tables.rkt b/fontland/fontland/tables.rkt index 71e96a4d..26f264f7 100644 --- a/fontland/fontland/tables.rkt +++ b/fontland/fontland/tables.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide (all-defined-out)) (require (for-syntax racket/string)) diff --git a/fontland/fontland/ttfglyph.rkt b/fontland/fontland/ttfglyph.rkt index 223d5cd6..9081157a 100644 --- a/fontland/fontland/ttfglyph.rkt +++ b/fontland/fontland/ttfglyph.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (require "glyph.rkt" xenomorph) (provide (all-defined-out)) #| diff --git a/fontland/fontland/ttfglyphencoder.rkt b/fontland/fontland/ttfglyphencoder.rkt index e34ed100..83521504 100644 --- a/fontland/fontland/ttfglyphencoder.rkt +++ b/fontland/fontland/ttfglyphencoder.rkt @@ -1,4 +1,6 @@ -#lang fontkit/racket +#lang racket/base +(require "racket.rkt") + (provide TTFGlyphEncoder) (define-subclass object% (TTFGlyphEncoder)