diff --git a/pitfall/pitfall/font/afm.rkt b/pitfall/pitfall/afm.rkt similarity index 100% rename from pitfall/pitfall/font/afm.rkt rename to pitfall/pitfall/afm.rkt diff --git a/pitfall/pitfall/mixins/color.rkt b/pitfall/pitfall/color.rkt similarity index 100% rename from pitfall/pitfall/mixins/color.rkt rename to pitfall/pitfall/color.rkt diff --git a/pitfall/pitfall/font/data/Courier-Bold.afm b/pitfall/pitfall/data/Courier-Bold.afm similarity index 100% rename from pitfall/pitfall/font/data/Courier-Bold.afm rename to pitfall/pitfall/data/Courier-Bold.afm diff --git a/pitfall/pitfall/font/data/Courier-BoldOblique.afm b/pitfall/pitfall/data/Courier-BoldOblique.afm similarity index 100% rename from pitfall/pitfall/font/data/Courier-BoldOblique.afm rename to pitfall/pitfall/data/Courier-BoldOblique.afm diff --git a/pitfall/pitfall/font/data/Courier-Oblique.afm b/pitfall/pitfall/data/Courier-Oblique.afm similarity index 100% rename from pitfall/pitfall/font/data/Courier-Oblique.afm rename to pitfall/pitfall/data/Courier-Oblique.afm diff --git a/pitfall/pitfall/font/data/Courier.afm b/pitfall/pitfall/data/Courier.afm similarity index 100% rename from pitfall/pitfall/font/data/Courier.afm rename to pitfall/pitfall/data/Courier.afm diff --git a/pitfall/pitfall/font/data/Helvetica-Bold.afm b/pitfall/pitfall/data/Helvetica-Bold.afm similarity index 100% rename from pitfall/pitfall/font/data/Helvetica-Bold.afm rename to pitfall/pitfall/data/Helvetica-Bold.afm diff --git a/pitfall/pitfall/font/data/Helvetica-BoldOblique.afm b/pitfall/pitfall/data/Helvetica-BoldOblique.afm similarity index 100% rename from pitfall/pitfall/font/data/Helvetica-BoldOblique.afm rename to pitfall/pitfall/data/Helvetica-BoldOblique.afm diff --git a/pitfall/pitfall/font/data/Helvetica-Oblique.afm b/pitfall/pitfall/data/Helvetica-Oblique.afm similarity index 100% rename from pitfall/pitfall/font/data/Helvetica-Oblique.afm rename to pitfall/pitfall/data/Helvetica-Oblique.afm diff --git a/pitfall/pitfall/font/data/Helvetica.afm b/pitfall/pitfall/data/Helvetica.afm similarity index 100% rename from pitfall/pitfall/font/data/Helvetica.afm rename to pitfall/pitfall/data/Helvetica.afm diff --git a/pitfall/pitfall/font/data/MustRead.html b/pitfall/pitfall/data/MustRead.html similarity index 100% rename from pitfall/pitfall/font/data/MustRead.html rename to pitfall/pitfall/data/MustRead.html diff --git a/pitfall/pitfall/font/data/Symbol.afm b/pitfall/pitfall/data/Symbol.afm similarity index 100% rename from pitfall/pitfall/font/data/Symbol.afm rename to pitfall/pitfall/data/Symbol.afm diff --git a/pitfall/pitfall/font/data/Times-Bold.afm b/pitfall/pitfall/data/Times-Bold.afm similarity index 100% rename from pitfall/pitfall/font/data/Times-Bold.afm rename to pitfall/pitfall/data/Times-Bold.afm diff --git a/pitfall/pitfall/font/data/Times-BoldItalic.afm b/pitfall/pitfall/data/Times-BoldItalic.afm similarity index 100% rename from pitfall/pitfall/font/data/Times-BoldItalic.afm rename to pitfall/pitfall/data/Times-BoldItalic.afm diff --git a/pitfall/pitfall/font/data/Times-Italic.afm b/pitfall/pitfall/data/Times-Italic.afm similarity index 100% rename from pitfall/pitfall/font/data/Times-Italic.afm rename to pitfall/pitfall/data/Times-Italic.afm diff --git a/pitfall/pitfall/font/data/Times-Roman.afm b/pitfall/pitfall/data/Times-Roman.afm similarity index 100% rename from pitfall/pitfall/font/data/Times-Roman.afm rename to pitfall/pitfall/data/Times-Roman.afm diff --git a/pitfall/pitfall/font/data/ZapfDingbats.afm b/pitfall/pitfall/data/ZapfDingbats.afm similarity index 100% rename from pitfall/pitfall/font/data/ZapfDingbats.afm rename to pitfall/pitfall/data/ZapfDingbats.afm diff --git a/pitfall/pitfall/document.rkt b/pitfall/pitfall/document.rkt index a38a369b..5a33a524 100644 --- a/pitfall/pitfall/document.rkt +++ b/pitfall/pitfall/document.rkt @@ -1,6 +1,6 @@ #lang pitfall/racket (require "reference.rkt" "object.rkt" "page.rkt") -(require "mixins/vector.rkt" "mixins/color.rkt" "mixins/fonts.rkt" "mixins/text.rkt") +(require "vector.rkt" "color.rkt" "fonts.rkt" "text.rkt") (provide PDFDocument) (define mixed% (text-mixin (fonts-mixin (color-mixin (vector-mixin object%))))) diff --git a/pitfall/pitfall/font.rkt b/pitfall/pitfall/font.rkt index ac926cf3..ac151899 100644 --- a/pitfall/pitfall/font.rkt +++ b/pitfall/pitfall/font.rkt @@ -1,5 +1,5 @@ #lang pitfall/racket -(require "font/standard-fonts.rkt" "font/afm.rkt" "reference.rkt") +(require "standard-fonts.rkt" "afm.rkt" "reference.rkt") (provide PDFFont PDFFont-open) (define PDFFont diff --git a/pitfall/pitfall/mixins/fonts.rkt b/pitfall/pitfall/fonts.rkt similarity index 96% rename from pitfall/pitfall/mixins/fonts.rkt rename to pitfall/pitfall/fonts.rkt index 88b68e5d..3d6d5d15 100644 --- a/pitfall/pitfall/mixins/fonts.rkt +++ b/pitfall/pitfall/fonts.rkt @@ -1,5 +1,5 @@ #lang pitfall/racket -(require "../font.rkt") +(require "font.rkt") (provide fonts-mixin) (define (fonts-mixin [% mixin-tester%]) @@ -75,8 +75,7 @@ [font (set-field! _font this font)] ;; save the font for reuse later [else - (when cacheKey - (hash-set! this-ff cacheKey this-f)) + (when cacheKey (hash-set! this-ff cacheKey this-f)) (hash-set! this-ff (ยท this-f name) this-f)])) this])) diff --git a/pitfall/pitfall/font/standard-fonts.rkt b/pitfall/pitfall/standard-fonts.rkt similarity index 100% rename from pitfall/pitfall/font/standard-fonts.rkt rename to pitfall/pitfall/standard-fonts.rkt diff --git a/pitfall/pitfall/mixins/text.rkt b/pitfall/pitfall/text.rkt similarity index 100% rename from pitfall/pitfall/mixins/text.rkt rename to pitfall/pitfall/text.rkt diff --git a/pitfall/pitfall/mixins/vector.rkt b/pitfall/pitfall/vector.rkt similarity index 99% rename from pitfall/pitfall/mixins/vector.rkt rename to pitfall/pitfall/vector.rkt index 00bc3d6c..d4c1d70c 100644 --- a/pitfall/pitfall/mixins/vector.rkt +++ b/pitfall/pitfall/vector.rkt @@ -1,5 +1,5 @@ #lang pitfall/racket -(require "../path.rkt") +(require "path.rkt") (provide vector-mixin default-ctm-value) (define (vector-mixin [% mixin-tester%])