retire the dark pattern

pitfall/pitfall/afm-font.rkt

@@ -1,5 +1,14 @@
 #lang at-exp racket/base
-(require "racket.rkt")
+(require
+  racket/class
+  racket/file
+  racket/match
+  racket/string
+  racket/contract
+  racket/list
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict)
 
 (provide AFMFont AFMFont-open)
 

pitfall/pitfall/annotations.rkt

@@ -1,5 +1,12 @@
 #lang racket/base
-(require "racket.rkt")
+(require
+  "struct.rkt"
+  racket/class
+  racket/match
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict)
 
 (provide annotation-mixin)
 

pitfall/pitfall/binprint.rkt

@@ -1,7 +1,9 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require sugar/list)
+(require
+  racket/string
+  racket/format
+  racket/function
+  sugar/list)
 (provide binprint)
 
 (define (binprint in #:width [width 16])
@@ -30,4 +32,4 @@
 
 (module+ test
   #;(binprint (open-input-bytes #"foobar is the name"))
-  (binprint (open-input-file "test/test12.pdf") #:width 24))
+  (binprint (open-input-file "../ptest/test12.pdf") #:width 24))

pitfall/pitfall/color.rkt

@@ -1,5 +1,13 @@
 #lang racket/base
-(require "racket.rkt")
+(require
+  "helper.rkt"
+  racket/class
+  racket/match
+  racket/string
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict)
 
 (provide color-mixin)
 

pitfall/pitfall/document.rkt

@@ -1,8 +1,25 @@
 #lang at-exp racket/base
-(require "racket.rkt")
-
-(require "reference.rkt" "object.rkt" "page.rkt")
-(require "vector.rkt" "color.rkt" "fonts.rkt" "text.rkt" "images.rkt" "annotations.rkt")
+(require
+  "helper.rkt"
+  "param.rkt"
+  "struct.rkt"
+  racket/class
+  racket/format
+  racket/contract
+  racket/list
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/unstable/port
+  "reference.rkt"
+  "object.rkt"
+  "page.rkt"
+  "vector.rkt"
+  "color.rkt"
+  "fonts.rkt"
+  "text.rkt"
+  "images.rkt"
+  "annotations.rkt")
 (provide PDFDocument)
 
 (define mixed% (annotation-mixin (image-mixin (text-mixin (fonts-mixin (color-mixin (vector-mixin object%)))))))

pitfall/pitfall/embedded.rkt

@@ -1,7 +1,23 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "font.rkt" fontland "reference.rkt")
+(require
+  (for-syntax racket/base)
+  "param.rkt"
+  "struct.rkt"
+  racket/class
+  racket/match
+  racket/string
+  racket/format
+  racket/contract
+  racket/list
+  racket/function
+  br/define
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/unstable/contract
+  "font.rkt"
+  fontland
+  "reference.rkt")
 (provide EmbeddedFont)
 
 #|

pitfall/pitfall/font-open.rkt

@@ -1,7 +1,11 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "standard-font.rkt" "font.rkt" fontland "embedded.rkt")
+(require
+  racket/class
+  racket/contract
+  "standard-font.rkt"
+  "font.rkt"
+  fontland
+  "embedded.rkt")
 (provide PDFFont-open)
 
 (define/contract (PDFFont-open document src family id)

pitfall/pitfall/font.rkt

@@ -1,7 +1,10 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "reference.rkt")
+(require
+  racket/class
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  "reference.rkt")
 (provide PDFFont)
 
 (define PDFFont

pitfall/pitfall/fonts.rkt

@@ -1,7 +1,12 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "font.rkt" "font-open.rkt")
+(require
+  racket/class
+  racket/match
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  "font-open.rkt")
 (provide fonts-mixin)
 
 (define (fonts-mixin [% mixin-tester%])

pitfall/pitfall/image.rkt

@@ -1,7 +1,10 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "jpeg.rkt" "png.rkt")
+(require
+  "helper.rkt"
+  racket/class
+  racket/contract
+  "jpeg.rkt"
+  "png.rkt")
 (provide PDFImage-open)
 
 #;(define PDFImage

pitfall/pitfall/images.rkt

@@ -1,7 +1,12 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "image.rkt")
+(require
+  racket/class
+  racket/match
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  "image.rkt")
 (provide image-mixin)
 
 (define (image-mixin [% mixin-tester%])

pitfall/pitfall/jpeg.rkt

@@ -1,5 +1,11 @@
 #lang debug racket/base
-(require "racket.rkt")
+(require
+  racket/class
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/unstable/port)
 
 (provide JPEG)
 

pitfall/pitfall/main.rkt

@@ -1,5 +1,3 @@
 #lang racket/base
-(require "racket.rkt")
-
 (require "document.rkt")
 (provide (all-from-out "document.rkt"))

pitfall/pitfall/object.rkt

@@ -1,7 +1,12 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require (only-in srfi/19 date->string))
+(require
+  "struct.rkt"
+  racket/class
+  racket/string
+  racket/contract
+  racket/list
+  sugar/unstable/js
+  (only-in srfi/19 date->string))
 (provide PDFObject convert)
 
 (define PDFObject

pitfall/pitfall/page-test.rkt

@@ -1,5 +1,10 @@
 #lang racket/base
-(require racket/class rackunit "document.rkt" "page.rkt" "reference.rkt" "helper.rkt" sugar/unstable/js)
+(require racket/class
+         rackunit
+         "document.rkt"
+         "page.rkt"
+         "reference.rkt"
+         sugar/unstable/js)
 (define p (make-object PDFPage (make-object PDFDocument)))
 (check-equal? (· p size) "letter")
 (check-equal? (· p layout) "portrait")

pitfall/pitfall/page.rkt

@@ -1,5 +1,10 @@
 #lang racket/base
-(require "racket.rkt")
+(require
+  racket/class
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict)
 
 (provide PDFPage)
 

pitfall/pitfall/path.rkt

@@ -1,7 +1,10 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require brag/support sugar/list)
+(require
+  racket/class
+  racket/match
+  racket/list
+  brag/support
+  sugar/list)
 (provide parse-svg-path)
 
 (define (parse-svg-path doc path)

pitfall/pitfall/pdftest.rkt

@@ -1,12 +1,36 @@
 #lang racket/base
-(require "racket.rkt" "check-pdf.rkt")
 
-(provide (all-from-out "racket.rkt"))
+(require
+  (for-syntax racket/base)
+  "helper.rkt"
+  "param.rkt"
+  "struct.rkt"
+  sugar/debug
+  racket/class
+  racket/file
+  racket/match
+  racket/string
+  racket/format
+  racket/contract
+  racket/list
+  racket/port
+  racket/function
+  br/define
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/unstable/stub
+  sugar/unstable/port
+  sugar/unstable/contract
+  describe
+  "check-pdf.rkt")
+
 (provide check-copy-equal? check-pdfkit? make-doc)
 
 (test-mode #t)
 
-(r+p rackunit racket/runtime-path pitfall/document)
+(require rackunit racket/runtime-path pitfall/document racket/class)
+(provide (all-from-out  rackunit racket/runtime-path pitfall/document racket/class))
 
 (define (this->control this) (path-add-extension this #"" #" copy."))
 

pitfall/pitfall/png-reader.rkt

@@ -1,7 +1,11 @@
 #lang racket/base
-(require "racket.rkt")
+(require
+  sugar/debug
+  racket/file
+  racket/contract
+  racket/list
+  sugar/unstable/dict)
 
-(require "zlib.rkt")
 (provide read-png)
 
 #|

pitfall/pitfall/png.rkt

@@ -1,5 +1,12 @@
 #lang debug racket/base
-(require "racket.rkt")
+(require
+  racket/class
+  racket/contract
+  racket/list
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/unstable/port)
 
 (require "png-reader.rkt" "zlib.rkt")
 (provide PNG)
@@ -86,7 +93,7 @@
   ;; embed the actual image data
   (send (· this obj) end (· this imgData)))
 
-(require sugar/debug racket/draw)
+(require racket/draw)
 ;; todo: this function is too slow.
 ;; switch to draw/unsafe/png
 (define/contract (splitAlphaChannel this)
@@ -105,15 +112,15 @@
   #;(report 'unpacking-argb)
   (define-values (imgBytes alphaBytes)
     (parameterize ([current-input-port (open-input-bytes pixels)])
-       (for/fold ([img-bytes empty]
-                  [alpha-bytes empty]
-                  #:result (values (apply bytes-append (reverse img-bytes))
-                                   (apply bytes-append (reverse alpha-bytes))))
-                 ([i (in-naturals)]
-                  #:break (eof-object? (peek-byte)))
-         (if (even? i)
-             (values img-bytes (cons (read-bytes 1) alpha-bytes))
-             (values (cons (read-bytes 3) img-bytes) alpha-bytes)))))
+      (for/fold ([img-bytes empty]
+                 [alpha-bytes empty]
+                 #:result (values (apply bytes-append (reverse img-bytes))
+                                  (apply bytes-append (reverse alpha-bytes))))
+                ([i (in-naturals)]
+                 #:break (eof-object? (peek-byte)))
+        (if (even? i)
+            (values img-bytes (cons (read-bytes 1) alpha-bytes))
+            (values (cons (read-bytes 3) img-bytes) alpha-bytes)))))
 
   #;(report 'deflate-imgBytes)
   (set-field! imgData this (deflate imgBytes))

pitfall/pitfall/racket.rkt

@@ -1,34 +0,0 @@
-#lang racket/base
-(require (for-syntax racket/base br/syntax))
-(provide (for-syntax (all-from-out racket/base br/syntax)))
-(provide (all-from-out racket/base) r+p)
-
-(define-syntax-rule (r+p id ...) (begin (require id ...) (provide (all-from-out id ...))))
-
-(r+p "helper.rkt"
-     "param.rkt"
-     "struct.rkt"
-     sugar/debug
-     racket/class
-     racket/file
-     racket/match
-     racket/string
-     racket/format
-     racket/contract
-     racket/list
-     racket/port
-     racket/function
-     br/define
-     sugar/unstable/class
-     sugar/unstable/js
-     sugar/unstable/dict
-     sugar/unstable/stub
-     sugar/unstable/port
-     sugar/unstable/contract
-     describe)
-
-(module reader syntax/module-reader
-  #:language 'pitfall/racket
-  #:read @-read
-  #:read-syntax @-read-syntax
-  (require (prefix-in @- scribble/reader)))

pitfall/pitfall/reference.rkt

@@ -1,7 +1,16 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "object.rkt" "zlib.rkt")
+(require
+  "helper.rkt"
+  "param.rkt"
+  racket/class
+  racket/contract
+  racket/list
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/unstable/port
+  "object.rkt"
+  "zlib.rkt")
 (provide PDFReference)
 
 (define-subclass object% (PDFReference document id [payload (mhash)])

pitfall/pitfall/standard-font.rkt

@@ -1,8 +1,16 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "afm-font.rkt" "font.rkt" fontland)
-(require racket/runtime-path)
+(require
+  (for-syntax racket/base)
+  racket/class
+  racket/file
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  "afm-font.rkt"
+  "font.rkt"
+  fontland
+  racket/runtime-path)
 (provide isStandardFont standard-fonts StandardFont)
 
 (define-subclass PDFFont (StandardFont document name id)

pitfall/pitfall/text.rkt

@@ -1,7 +1,16 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require sugar/list racket/promise)
+(require
+  racket/class
+  racket/match
+  racket/string
+  racket/contract
+  racket/list
+  racket/function
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  sugar/list
+  racket/promise)
 (provide text-mixin)
 
 #|

pitfall/pitfall/vector.rkt

@@ -1,7 +1,14 @@
 #lang racket/base
-(require "racket.rkt")
-
-(require "path.rkt")
+(require
+  "helper.rkt"
+  racket/class
+  racket/match
+  racket/string
+  racket/contract
+  sugar/unstable/class
+  sugar/unstable/js
+  sugar/unstable/dict
+  "path.rkt")
 (provide vector-mixin default-ctm-value)
 
 (define (vector-mixin [% mixin-tester%])

pitfall/pitfall/zlib.rkt

@@ -1,5 +1,4 @@
 #lang racket/base
-(require "racket.rkt")
 
 (provide deflate inflate)